From f35ed4bbc2b05f1b83476b60948d64375f77f1b4 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 10 Jan 2007 18:56:51 +0000 Subject: (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. --- src/stdafx.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/stdafx.h') diff --git a/src/stdafx.h b/src/stdafx.h index eae4fa512..89d51c477 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -7,6 +7,7 @@ #include #include #include +#include // MacOS X will use an NSAlert to display failed assertaions since they're lost unless running from a terminal // strgen always runs from terminal and don't need a window for asserts @@ -103,6 +104,7 @@ # define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers # pragma warning(disable: 4244) // 'conversion' conversion from 'type1' to 'type2', possible loss of data # pragma warning(disable: 4761) // integral size mismatch in argument : conversion supplied +# pragma warning(disable: 4200) // nonstandard extension used : zero-sized array in struct/union # if _MSC_VER >= 1400 // MSVC 2005 safety checks # pragma warning(disable: 4996) // 'strdup' was declared deprecated @@ -306,7 +308,4 @@ assert_compile(sizeof(uint8) == 1); # define Point OTTD_AMIGA_POINT #endif -#define EXTERN_C_BEGIN extern "C" { -#define EXTERN_C_END } - #endif /* STDAFX_H */ -- cgit v1.2.3-54-g00ecf