equal
deleted
inserted
replaced
62 # define NORETURN __declspec(noreturn) |
62 # define NORETURN __declspec(noreturn) |
63 # define FORCEINLINE __forceinline |
63 # define FORCEINLINE __forceinline |
64 # define inline _inline |
64 # define inline _inline |
65 # define CDECL _cdecl |
65 # define CDECL _cdecl |
66 # define NOT_REACHED() _assume(0) |
66 # define NOT_REACHED() _assume(0) |
67 # define snprintf _snprintf |
67 int snprintf(char *str, size_t size, const char *format, ...); |
68 # define vsnprintf _vsnprintf |
68 int vsnprintf(char *str, size_t size, const char *format, va_list ap); |
69 # undef TTD_ALIGNMENT_4 |
69 # undef TTD_ALIGNMENT_4 |
70 # undef TTD_ALIGNMENT_2 |
70 # undef TTD_ALIGNMENT_2 |
71 # define GCC_PACK |
71 # define GCC_PACK |
72 #endif |
72 #endif |
73 |
73 |
93 typedef unsigned int uint32; |
93 typedef unsigned int uint32; |
94 #endif |
94 #endif |
95 |
95 |
96 // This is already defined in unix |
96 // This is already defined in unix |
97 #if !defined(UNIX) && !defined(__CYGWIN__) |
97 #if !defined(UNIX) && !defined(__CYGWIN__) |
|
98 typedef unsigned int uint; |
|
99 #endif |
|
100 // Not defined in QNX Neutrino (6.x) |
|
101 #if defined(__QNXNTO__) |
98 typedef unsigned int uint; |
102 typedef unsigned int uint; |
99 #endif |
103 #endif |
100 |
104 |
101 #ifndef __BEOS__ |
105 #ifndef __BEOS__ |
102 typedef signed char int8; |
106 typedef signed char int8; |
173 // take care of some name clashes on macos |
177 // take care of some name clashes on macos |
174 #if defined(__APPLE__) |
178 #if defined(__APPLE__) |
175 #define GetString OTTD_GetString |
179 #define GetString OTTD_GetString |
176 #define DrawString OTTD_DrawString |
180 #define DrawString OTTD_DrawString |
177 #define Random OTTD_Random |
181 #define Random OTTD_Random |
|
182 #define CloseConnection OTTD_CloseConnection |
178 #endif |
183 #endif |
179 |
184 |
180 #endif // !defined(_STDAFX_H) |
185 #endif // !defined(_STDAFX_H) |