3 files changed, 1 insertions, 53 deletions
diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp
index 59e31a8cfd..447de7b837 100644
--- a/engines/sci/engine/game.cpp
+++ b/engines/sci/engine/game.cpp
@@ -727,9 +727,6 @@ void script_free_breakpoints(EngineState *s) {
 /*************************************************************/
 
 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 @@ int game_exit(EngineState *s) {
 
 	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);
diff --git a/engines/sci/engine/kdebug.h b/engines/sci/engine/kdebug.h
index 7f586b50a4..1450b1f281 100644
--- a/engines/sci/engine/kdebug.h
+++ b/engines/sci/engine/kdebug.h
@@ -63,37 +63,19 @@ struct EngineState;
 
 #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.
diff --git a/engines/sci/tools.cpp b/engines/sci/tools.cpp
index b3c2fa7d19..b20c608104 100644
--- a/engines/sci/tools.cpp
+++ b/engines/sci/tools.cpp
@@ -93,28 +93,4 @@ void _SCIkdebug(EngineState *s, const char *file, int line, int area, const char
 	}
 }
 
-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