From cf54a636396002c268404b8ba4f11a84fc99a127 Mon Sep 17 00:00:00 2001
From: Jonathan Gray
Date: Sun, 18 May 2003 13:39:02 +0000
Subject: HAVE_CONFIG_H

svn-id: r7632
---
 common/gameDetector.cpp | 4 ++++
 common/scummsys.h       | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'common')

diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp
index a45ed45d0d..2d4dafb226 100644
--- a/common/gameDetector.cpp
+++ b/common/gameDetector.cpp
@@ -27,6 +27,10 @@
 #include "config-file.h"
 #include "scaler.h"	// Only for gfx_modes
 
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #define CHECK_OPTION() if ((current_option != NULL) || (*s != '\0')) goto ShowHelpAndExit
 #define HANDLE_OPTION() if ((*s == '\0') && (current_option == NULL)) goto ShowHelpAndExit;  \
                         if ((*s != '\0') && (current_option != NULL)) goto ShowHelpAndExit; \
diff --git a/common/scummsys.h b/common/scummsys.h
index 3bdd10440f..be4b821139 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -25,7 +25,9 @@
 #include <stdlib.h>
 
 // TODO - use config.h, generated by configure
-//#include "config.h"
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
 
 #if defined(USE_MAD) || defined(USE_VORBIS)
 #define COMPRESSED_SOUND_FILE
@@ -123,7 +125,7 @@
 	#define FORCEINLINE inline
 	#define CDECL 
 
-	#ifndef CONFIG_H
+	#ifndef HAVE_CONFIG_H
 	typedef unsigned char byte;
 	typedef unsigned char uint8;
 	typedef unsigned short uint16;
-- 
cgit v1.2.3