Changeset 5822 in orxonox.OLD for trunk/src/defs/debug.h

Timestamp:

Nov 29, 2005, 2:22:37 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/network to the trunk
merged with command:
svn merge -r 5505:HEAD branches/network trunk

conflicts resolved in favor of the trunk (as always
also fixed a typo in the #include "SDL_tread.h"

File:

• trunk/src/defs/debug.h (modified) (1 diff)

trunk/src/defs/debug.h

@@ -106 +106 @@
 #define PRINTF(x)        PRINT(x)
 #endif
+#ifndef NO_SHELL
 #define PRINT_EXEC       ShellBuffer::addBufferLineStatic
+#else /* NO_SHELL */
+#define PRINT_EXEC       printf
+#endif
 
 #ifndef PRINTF