diff options
| author | Alex <colomar.6.4.3@gmail.com> | 2019-05-20 22:27:34 +0100 |
|---|---|---|
| committer | Alex <colomar.6.4.3@gmail.com> | 2019-05-20 22:27:34 +0100 |
| commit | deda7bf2683ce92f3dadc026ed438384af19dcb5 (patch) | |
| tree | b6d523ea5903338a222293761d5a75d9ba2fb662 | |
| parent | 8af71ac6c88e2d10fc5105f3ce0c107f64e83d8b (diff) | |
| parent | 307437931a089311bd9270ac76ed9692f03f84b1 (diff) | |
Merge branch 'master' of https://github.com/alejandro-colomar/vision-artificial
| -rw-r--r-- | src/main.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index 1a8f5de..5abfb20 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -12,6 +12,10 @@ #include "libalx/base/stdio/wait.hpp" #include "libalx/extra/ncurses/common.hpp" +/* Workaround <ncurses.h> naming collision */ +#undef LINES +#undef COLS + #include "vision-artificial/about/about.hpp" #include "vision-artificial/image/iface.hpp" #include "vision-artificial/menu/iface.hpp" @@ -23,7 +27,7 @@ /****************************************************************************** ******* static functions ***************************************************** ******************************************************************************/ -static void init (int *argc, char *(*argv[])); +static void init (int argc, char *argv[]); static void deinit (void); @@ -33,7 +37,7 @@ static void deinit (void); int main (int argc, char *argv[]) { - init(&argc, &argv); + init(argc, argv); print_share_file(SHARE_COPYRIGHT); alx_wait4enter(); @@ -49,7 +53,7 @@ int main (int argc, char *argv[]) /****************************************************************************** ******* static functions ***************************************************** ******************************************************************************/ -static void init (int *argc, char *(*argv[])) +static void init (int argc, char *argv[]) { alx_ncurses_init(); @@ -62,7 +66,7 @@ static void init (int *argc, char *(*argv[])) user_iface_mode = USER_IFACE_TUI; user_iface_log.visible = 2; - parse(*argc, *argv); + parse(argc, argv); } static void deinit (void) |