[Scummvm-cvs-logs] CVS: scummvm/common gameDetector.cpp,1.93,1.94 scummsys.h,1.21,1.22

Jonathan Gray khalek at users.sourceforge.net
Sun May 18 06:38:11 CEST 2003


Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv21229

Modified Files:
	gameDetector.cpp scummsys.h 
Log Message:
HAVE_CONFIG_H

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- gameDetector.cpp	17 May 2003 03:05:13 -0000	1.93
+++ gameDetector.cpp	18 May 2003 13:37:14 -0000	1.94
@@ -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; \

Index: scummsys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scummsys.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- scummsys.h	30 Apr 2003 13:40:20 -0000	1.21
+++ scummsys.h	18 May 2003 13:37:14 -0000	1.22
@@ -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;





More information about the Scummvm-git-logs mailing list