From 8a718d5f27d679cfa906b9866c1c01bdf6df72b3 Mon Sep 17 00:00:00 2001 From: evilynux Date: Wed, 10 Jan 2007 05:04:57 +0000 Subject: [PATCH] Using _UI suffix for better understanding. --- desmume/src/cli/main.c | 4 ++++ desmume/src/ctrlssdl.c | 4 ++-- desmume/src/gtk-glade/globals.h | 4 +++- desmume/src/gtk/globals.h | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/desmume/src/cli/main.c b/desmume/src/cli/main.c index f930804b4..841d95f24 100644 --- a/desmume/src/cli/main.c +++ b/desmume/src/cli/main.c @@ -3,6 +3,10 @@ #include #include +#ifndef CLI_UI +#define CLI_UI +#endif + #include "../MMU.h" #include "../NDSSystem.h" #include "../cflash.h" diff --git a/desmume/src/ctrlssdl.c b/desmume/src/ctrlssdl.c index a7d775d15..44f55b0e9 100644 --- a/desmume/src/ctrlssdl.c +++ b/desmume/src/ctrlssdl.c @@ -125,7 +125,7 @@ u16 process_ctrls_events(u16 keypad) break; /* When GTK is in use, the keyboard, mouse and quit events are handled by GTK. */ -#ifndef GTK +#ifndef GTK_UI case SDL_KEYDOWN: switch (event.key.keysym.sym) { @@ -157,7 +157,7 @@ u16 process_ctrls_events(u16 keypad) case '.': RM_KEY( keypad, 0x100); break; } break; -#endif +#endif // GTK_UI default: break; } diff --git a/desmume/src/gtk-glade/globals.h b/desmume/src/gtk-glade/globals.h index b6f081c10..6a93ca182 100755 --- a/desmume/src/gtk-glade/globals.h +++ b/desmume/src/gtk-glade/globals.h @@ -22,7 +22,9 @@ #ifndef __GLOBALS_H__ #define __GLOBALS_H__ -#define GTK +#ifndef GTK_UI +#define GTK_UI +#endif #include #include diff --git a/desmume/src/gtk/globals.h b/desmume/src/gtk/globals.h index 266966fd5..1bcb3f5db 100644 --- a/desmume/src/gtk/globals.h +++ b/desmume/src/gtk/globals.h @@ -23,7 +23,9 @@ #ifndef GLOBALS_H #define GLOBALS_H -#define GTK +#ifndef GTK_UI +#define GTK_UI +#endif #include #include