[Scummvm-cvs-logs] SF.net SVN: scummvm: [21624] scummvm/trunk/common/scummsys.h
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue Apr 4 17:55:07 CEST 2006
Revision: 21624
Author: fingolfin
Date: 2006-04-04 17:54:10 -0700 (Tue, 04 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21624&view=rev
Log Message:
-----------
Added SCUMMVM_DONT_DEFINE_TYPES so that (a) porters can still override our typedefs if they must, and (b) my image of evil-scummsys.h-changer is strengthened
Modified Paths:
--------------
scummvm/trunk/common/scummsys.h
Modified: scummvm/trunk/common/scummsys.h
===================================================================
--- scummvm/trunk/common/scummsys.h 2006-04-05 00:46:27 UTC (rev 21623)
+++ scummvm/trunk/common/scummsys.h 2006-04-05 00:54:10 UTC (rev 21624)
@@ -55,10 +55,21 @@
// SCUMMVM_USE_LONG_INT
// - Define this if your port needs to use 'long' for the int32 datatype
// (i.e. an integer with exactly 32 bits).
+// SCUMMVM_DONT_DEFINE_TYPES
+// - Define this if you need to provide your own typedefs, e.g. because your
+// system headers conflict with our typenames, or because you have odd
+// type requirements.
// SMALL_SCREEN_DEVICE
// - ...
// ...
+// We define all types in config.h, so we don't want to typedef those types
+// here again!
+#ifdef HAVE_CONFIG_H
+#define SCUMMVM_DONT_DEFINE_TYPES
+#endif
+
+
#if defined(_MSC_VER) && !defined(__SYMBIAN32__)
#define scumm_stricmp stricmp
@@ -357,9 +368,9 @@
//
-// Typedef our system types unless they were already set by config.h
+// Typedef our system types unless SCUMMVM_DONT_DEFINE_TYPES is set.
//
-#ifndef HAVE_CONFIG_H
+#ifndef SCUMMVM_DONT_DEFINE_TYPES
typedef unsigned char byte;
typedef unsigned char uint8;
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