diff options
| author | Marco Peereboom <marco@conformal.com> | 2012-01-25 10:18:19 -0600 |
|---|---|---|
| committer | Marco Peereboom <marco@conformal.com> | 2012-01-25 10:18:19 -0600 |
| commit | 7e84238389d57060dba3e47625da0a43f117eda7 (patch) | |
| tree | 2417a5c1c5a8adc30d3ee4641fa7fd7f5911929e | |
| parent | 5bb63a46cd629de6605d249844cc95b07d390739 (diff) | |
| download | xombrero-7e84238389d57060dba3e47625da0a43f117eda7.tar.gz | |
windows and unix have different argv definitions
| -rw-r--r-- | xxxterm.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/xxxterm.c b/xxxterm.c index a84aca5..31cee7a 100644 --- a/xxxterm.c +++ b/xxxterm.c @@ -222,9 +222,16 @@ void set_current_tab(int page_num); gboolean update_statusbar_position(GtkAdjustment*, gpointer); void marks_clear(struct tab *t); +/* windows uses a different argv declaration */ +#if __MINGW32__ +#define ARGV_TYPE const char ** +#else +#define ARGV_TYPE char * const * +#endif + /* globals */ extern char *__progname; -char * const *start_argv; +ARGV_TYPE start_argv; struct passwd *pwd; GtkWidget *main_window; GtkNotebook *notebook; @@ -7321,7 +7328,7 @@ main(int argc, char **argv) FILE *f = NULL; struct karg a; - start_argv = (char * const *)argv; + start_argv = (ARGV_TYPE)argv; /* prepare gtk */ #ifdef USE_THREADS |