comparison src/stdafx.h @ 5587:c44c070c5032 draft

(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
author rubidium <rubidium@openttd.org>
date Wed, 10 Jan 2007 18:56:51 +0000
parents 72a87cf63833
children cf00a1ba52bc
comparison
equal deleted inserted replaced
5586:9a8c53342d29 5587:c44c070c5032
5 5
6 #include <stdio.h> 6 #include <stdio.h>
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <string.h> 8 #include <string.h>
9 #include <stdlib.h> 9 #include <stdlib.h>
10 #include <limits.h>
10 11
11 // MacOS X will use an NSAlert to display failed assertaions since they're lost unless running from a terminal 12 // MacOS X will use an NSAlert to display failed assertaions since they're lost unless running from a terminal
12 // strgen always runs from terminal and don't need a window for asserts 13 // strgen always runs from terminal and don't need a window for asserts
13 #if !defined(__APPLE__) || defined(STRGEN) 14 #if !defined(__APPLE__) || defined(STRGEN)
14 # include <assert.h> 15 # include <assert.h>
101 #if defined(_MSC_VER) 102 #if defined(_MSC_VER)
102 # pragma once 103 # pragma once
103 # define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers 104 # define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
104 # pragma warning(disable: 4244) // 'conversion' conversion from 'type1' to 'type2', possible loss of data 105 # pragma warning(disable: 4244) // 'conversion' conversion from 'type1' to 'type2', possible loss of data
105 # pragma warning(disable: 4761) // integral size mismatch in argument : conversion supplied 106 # pragma warning(disable: 4761) // integral size mismatch in argument : conversion supplied
107 # pragma warning(disable: 4200) // nonstandard extension used : zero-sized array in struct/union
106 108
107 # if _MSC_VER >= 1400 // MSVC 2005 safety checks 109 # if _MSC_VER >= 1400 // MSVC 2005 safety checks
108 # pragma warning(disable: 4996) // 'strdup' was declared deprecated 110 # pragma warning(disable: 4996) // 'strdup' was declared deprecated
109 # define _CRT_SECURE_NO_DEPRECATE // all deprecated 'unsafe string functions 111 # define _CRT_SECURE_NO_DEPRECATE // all deprecated 'unsafe string functions
110 # endif /* _MSC_VER >= 1400 */ 112 # endif /* _MSC_VER >= 1400 */
304 #ifdef __AMIGA__ 306 #ifdef __AMIGA__
305 // it seems AmigaOS already have a Point declared 307 // it seems AmigaOS already have a Point declared
306 # define Point OTTD_AMIGA_POINT 308 # define Point OTTD_AMIGA_POINT
307 #endif 309 #endif
308 310
309 #define EXTERN_C_BEGIN extern "C" {
310 #define EXTERN_C_END }
311
312 #endif /* STDAFX_H */ 311 #endif /* STDAFX_H */