--- a/dmd/mars.h	Fri Apr 03 17:02:52 2009 +0200
+++ b/dmd/mars.h	Fri Apr 03 17:59:34 2009 +0200
@@ -57,6 +57,7 @@
  */
 
 
+#include <stdio.h>
 #include <stdint.h>
 #include <stdarg.h>
 #include <stddef.h>
@@ -77,7 +78,8 @@
 
 #define DMDV2	0	// Version 2.0 features
 #define BREAKABI 1	// 0 if not ready to break the ABI just yet
-#define STRUCTTHISREF V2	// if 'this' for struct is a reference, not a pointer
+#define STRUCTTHISREF DMDV2	// if 'this' for struct is a reference, not a pointer
+#define SNAN_DEFAULT_INIT DMDV2	// if floats are default initialized to signalling NaN
 
 /* Other targets are TARGET_LINUX and TARGET_OSX, which are
  * set on the command line via the compiler makefile.
@@ -261,11 +263,6 @@
 #define WINDOWS_SEH	(_WIN32 && __DMC__)
 
 
-#if __GNUC__
-//#define memicmp strncasecmp
-//#define stricmp strcasecmp
-#endif
-
 #ifdef __DMC__
  typedef _Complex long double complex_t;
 #else
@@ -274,12 +271,13 @@
  #endif
  #ifdef __APPLE__
   //#include "complex.h"//This causes problems with include the c++ <complex> and not the C "complex.h"
-  #define integer_t dmd_integer_t
  #endif
 #endif
 
-// Be careful not to care about sign when using integer_t
-typedef uint64_t integer_t;
+// Be careful not to care about sign when using dinteger_t
+//typedef uint64_t integer_t;
+typedef uint64_t dinteger_t;	// use this instead of integer_t to
+				// avoid conflicts with system #include's
 
 // Signed and unsigned variants
 typedef int64_t sinteger_t;