gui: mark all fds used for select() as non-blocking.

[paraslash.git] / sdl_gui.c

diff --git a/sdl_gui.c b/sdl_gui.c
index a1381c2f202b0f7e9fd5c2e1003203129ea60fcf..c30465e57e1f74fe47c2fb34e10d134ad7624c5d 100644 (file)
--- a/sdl_gui.c
+++ b/sdl_gui.c
@@ -43,7 +43,7 @@ static int width = 0;
 static int height = 0;
 
 extern const char *status_item_list[NUM_STAT_ITEMS];
-struct gengetopt_args_info args_info;
+struct sdl_gui_args_info args_info;
 
 #define FRAME_WIDTH 10
 #define FONT_HEIGHT 36
@@ -119,7 +119,7 @@ struct font fonts[] = {
 
 static struct stat_item stat_items[NUM_STAT_ITEMS];
 
-void para_log(__unused int ll, __unused const char* fmt,...) /* no logging */
+void para_log(__a_unused int ll, __a_unused const char* fmt,...) /* no logging */
 {
 }
 
@@ -742,7 +742,7 @@ int main(int argc, char *argv[])
        int i, ret, pipe;
        SDLKey sym;
 
-       cmdline_parser(argc, argv, &args_info);
+       sdl_gui_cmdline_parser(argc, argv, &args_info);
        ret = configfile_exists();
 //     printf("w=%i,h=%i,ret=%i, cf=%s\n", width, height, ret, args_info.config_file_arg);
 
@@ -752,7 +752,7 @@ int main(int argc, char *argv[])
                exit(EXIT_FAILURE);
        }
        if (ret)
-               cmdline_parser_configfile(args_info.config_file_arg,
+               sdl_gui_cmdline_parser_configfile(args_info.config_file_arg,
                        &args_info, 0, 0, 0);
        signal(SIGCHLD, SIG_IGN);
        width = args_info.width_arg;