M src/gba/supervisor/cli.c → src/gba/supervisor/cli.c

@@ -30,11 +30,9 @@ { "rewind", _rewind, CLIDVParse, "Rewind the emulation a number of recorded intervals" },
 	{ "save", _save, CLIDVParse, "Save a savestate" },
 	{ 0, 0, 0, 0 }
 };
-#endif
 
 struct GBACLIDebugger* GBACLIDebuggerCreate(struct GBAThread* context) {
 	struct GBACLIDebugger* debugger = malloc(sizeof(struct GBACLIDebugger));
-#ifdef USE_CLI_DEBUGGER
 	debugger->d.init = _GBACLIDebuggerInit;
 	debugger->d.deinit = _GBACLIDebuggerDeinit;
 	debugger->d.custom = _GBACLIDebuggerCustom;
@@ -44,14 +42,10 @@ debugger->d.name = "Game Boy Advance";
 	debugger->d.commands = _GBACLIDebuggerCommands;
 
 	debugger->context = context;
-#else
-	UNUSED(context);
-#endif
 
 	return debugger;
 }
 
-#ifdef USE_CLI_DEBUGGER
 static void _GBACLIDebuggerInit(struct CLIDebuggerSystem* debugger) {
 	struct GBACLIDebugger* gbaDebugger = (struct GBACLIDebugger*) debugger;
 

M src/gba/supervisor/cli.h → src/gba/supervisor/cli.h

@@ -6,21 +6,21 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #ifndef GBA_CLI_H
 #define GBA_CLI_H
 
+#ifdef USE_CLI_DEBUGGER
 #include "debugger/cli-debugger.h"
 
 struct GBAThread;
 
 struct GBACLIDebugger {
-#ifdef USE_CLI_DEBUGGER
 	struct CLIDebuggerSystem d;
 
 	struct GBAThread* context;
 
 	bool frameAdvance;
 	bool inVblank;
-#endif
 };
 
 struct GBACLIDebugger* GBACLIDebuggerCreate(struct GBAThread*);
+#endif
 
 #endif