diff options
| author | Marco Peereboom <marco@conformal.com> | 2012-01-27 14:32:55 -0600 |
|---|---|---|
| committer | Marco Peereboom <marco@conformal.com> | 2012-01-27 14:33:12 -0600 |
| commit | 9f9d2b7b5286d704078a3351dca0d2c3bc0d0e30 (patch) | |
| tree | fbb74b5a39e412fb2acaeac4c105a2c7756afcc2 | |
| parent | 5f6ac285c33a590db2a7d932542020a0954b9a01 (diff) | |
| download | xombrero-9f9d2b7b5286d704078a3351dca0d2c3bc0d0e30.tar.gz | |
make debug work and lose ARGV_TYPE now that we use mingw64
| -rw-r--r-- | xxxterm.c | 13 | ||||
| -rw-r--r-- | xxxterm.h | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/xxxterm.c b/xxxterm.c index d309862..ed7e01e 100644 --- a/xxxterm.c +++ b/xxxterm.c @@ -25,7 +25,7 @@ char *version = XXXTERM_VERSION; #ifdef XT_DEBUG -u_int32_t swm_debug = 0 +uint32_t swm_debug = 0 | XT_D_MOVE | XT_D_KEY | XT_D_TAB @@ -222,16 +222,9 @@ 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; -ARGV_TYPE start_argv; +char * const *start_argv; struct passwd *pwd; GtkWidget *main_window; GtkNotebook *notebook; @@ -7353,7 +7346,7 @@ main(int argc, char **argv) FILE *f = NULL; struct karg a; - start_argv = (ARGV_TYPE)argv; + start_argv = (char * const *)argv; /* prepare gtk */ #ifdef USE_THREADS diff --git a/xxxterm.h b/xxxterm.h index 32ef75b..ae58a79 100644 --- a/xxxterm.h +++ b/xxxterm.h @@ -142,7 +142,7 @@ THE SOFTWARE. #define XT_D_INSPECTOR 0x8000 #define XT_D_VISITED 0x10000 #define XT_D_HISTORY 0x20000 -extern u_int32_t swm_debug; +extern uint32_t swm_debug; #else #define DPRINTF(x...) #define DNPRINTF(n,x...) |