[Scummvm-cvs-logs] SF.net SVN: scummvm:[38863] scummvm/trunk/engines/sci

aquadran at users.sourceforge.net aquadran at users.sourceforge.net
Tue Feb 24 23:24:59 CET 2009


Revision: 38863
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38863&view=rev
Author:   aquadran
Date:     2009-02-24 22:24:58 +0000 (Tue, 24 Feb 2009)

Log Message:
-----------
remove code related __GNU__XX defines

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/game.cpp
    scummvm/trunk/engines/sci/engine/kdebug.h
    scummvm/trunk/engines/sci/tools.cpp

Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp	2009-02-24 22:01:10 UTC (rev 38862)
+++ scummvm/trunk/engines/sci/engine/game.cpp	2009-02-24 22:24:58 UTC (rev 38863)
@@ -727,9 +727,6 @@
 /*************************************************************/
 
 int game_init(EngineState *s) {
-#ifdef __GNUC__XX
-#  warning "Fixme: Use new VM instantiation code all over the place"
-#endif
 	reg_t game_obj; // Address of the game object
 	dstack_t *stack;
 
@@ -822,18 +819,11 @@
 
 	sciprintf("Freeing miscellaneous data...\n");
 
-#ifdef __GNUC__XX
-#warning "Free parser segment here"
-#endif
 	if (send_calls_allocated) {
 		free(send_calls);
 		send_calls_allocated = 0;
 	}
 
-#ifdef __GNUC__XX
-#warning "Free scripts here"
-#endif
-
 	menubar_free(s->menubar);
 
 	_free_graphics_input(s);

Modified: scummvm/trunk/engines/sci/engine/kdebug.h
===================================================================
--- scummvm/trunk/engines/sci/engine/kdebug.h	2009-02-24 22:01:10 UTC (rev 38862)
+++ scummvm/trunk/engines/sci/engine/kdebug.h	2009-02-24 22:24:58 UTC (rev 38863)
@@ -63,37 +63,19 @@
 
 #ifdef SCI_KERNEL_DEBUG
 
-#ifdef __GNUC__XXX
-
-#define SCIkdebug(arguments...) _SCIGNUkdebug(__PRETTY_FUNCTION__,  ## arguments)
-
-#else /* !__GNUC__ */
-
 #define SCIkdebug _SCIkdebug
 
-#endif /* !__GNUC__ */
-
 #else /* !SCI_KERNEL_DEBUG */
 
 #define SCIkdebug 1? (void)0 : _SCIkdebug
 
 #endif /* !SCI_KERNEL_DEBUG */
 
-
-#ifdef __GNUC__XXX
-
-#define SCIkwarn(arguments...) _SCIGNUkdebug(__PRETTY_FUNCTION__, ## arguments)
-
-#else /* !__GNUC__ */
-
 #define SCIkwarn _SCIkwarn
 
-#endif /* !__GNUC__ */
-
- /* Internal functions */
+/* Internal functions */
 void _SCIkwarn(EngineState *s, const char *file, int line, int area, const char *format, ...);
 void _SCIkdebug(EngineState *s, const char *file, int line, int area, const char *format, ...);
-void _SCIGNUkdebug(const char *funcname, EngineState *s, const char *file, int line, int area, const char *format, ...);
 
 /* If mode=1, enables debugging for specified areas. If mode=0, disables
 ** debugging for specified areas.

Modified: scummvm/trunk/engines/sci/tools.cpp
===================================================================
--- scummvm/trunk/engines/sci/tools.cpp	2009-02-24 22:01:10 UTC (rev 38862)
+++ scummvm/trunk/engines/sci/tools.cpp	2009-02-24 22:24:58 UTC (rev 38863)
@@ -93,28 +93,4 @@
 	}
 }
 
-void _SCIGNUkdebug(const char *funcname, EngineState *s, const char *file, int line, int area, const char *format, ...) {
-	va_list xargs;
-	int error = ((area == SCIkWARNING_NR) || (area == SCIkERROR_NR));
-
-	if (error || (s->debug_mode & (1 << area))) { // Is debugging enabled for this area?
-
-		fprintf(stderr, "FSCI: ");
-
-		if (area == SCIkERROR_NR)
-			fprintf(stderr, "ERROR in %s ", funcname);
-		else if (area == SCIkWARNING_NR)
-			fprintf(stderr, "%s: Warning ", funcname);
-		else
-			fprintf(stderr, "%s", funcname);
-
-		fprintf(stderr, "(%s L%d): ", file, line);
-
-		va_start(xargs, format);
-		_SCIkvprintf(stderr, format, xargs);
-		va_end(xargs);
-
-	}
-}
-
 } // End of namespace Sci


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list