diff options
| author | Matthew Hoops | 2011-06-03 01:14:16 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-06-03 01:14:16 -0400 |
| commit | 224c71e483e09931ba386555ff3b436b9defe63d (patch) | |
| tree | 8e6178331a7bbd3ee1be318d3fc7a7c7f478468f /gui/debugger.h | |
| parent | d4c92983920cfe3b25a22d91e12c750e591b917e (diff) | |
| parent | 547fd1bdcabcba0e741eb31100ba99ff73399d24 (diff) | |
| download | scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.gz scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.bz2 scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'gui/debugger.h')
| -rw-r--r-- | gui/debugger.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gui/debugger.h b/gui/debugger.h index c6fce87107..6da569e0f8 100644 --- a/gui/debugger.h +++ b/gui/debugger.h @@ -29,7 +29,7 @@ namespace GUI { -#ifndef USE_TEXT_CONSOLE +#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER class ConsoleDialog; #endif @@ -144,7 +144,7 @@ private: */ bool _firstTime; -#ifndef USE_TEXT_CONSOLE +#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER GUI::ConsoleDialog *_debuggerDialog; #endif @@ -194,7 +194,7 @@ protected: bool Cmd_DebugFlagEnable(int argc, const char **argv); bool Cmd_DebugFlagDisable(int argc, const char **argv); -#ifndef USE_TEXT_CONSOLE +#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER private: static bool debuggerInputCallback(GUI::ConsoleDialog *console, const char *input, void *refCon); static bool debuggerCompletionCallback(GUI::ConsoleDialog *console, const char *input, Common::String &completion, void *refCon); |