diff options
| author | truelight <truelight@openttd.org> | 2004-12-04 17:54:56 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2004-12-04 17:54:56 +0000 |
| commit | d6a1f3e412834c52b09e297cffc36d0776cb7a92 (patch) | |
| tree | 68d3e795694a875138c369707ed74b5b4b022d49 /stdafx.h | |
| parent | c90bba35a23204c47151cf0ab97b16d8a124dabe (diff) | |
| download | openttd-d6a1f3e412834c52b09e297cffc36d0776cb7a92.tar.xz | |
(svn r942) -Merged branch/network back into the trunk
Diffstat (limited to 'stdafx.h')
| -rw-r--r-- | stdafx.h | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -64,8 +64,8 @@ # define inline _inline # define CDECL _cdecl # define NOT_REACHED() _assume(0) -# define snprintf _snprintf -# define vsnprintf _vsnprintf +int snprintf(char *str, size_t size, const char *format, ...); +int vsnprintf(char *str, size_t size, const char *format, va_list ap); # undef TTD_ALIGNMENT_4 # undef TTD_ALIGNMENT_2 # define GCC_PACK @@ -97,6 +97,10 @@ typedef unsigned int uint32; #if !defined(UNIX) && !defined(__CYGWIN__) typedef unsigned int uint; #endif +// Not defined in QNX Neutrino (6.x) +#if defined(__QNXNTO__) + typedef unsigned int uint; +#endif #ifndef __BEOS__ typedef signed char int8; @@ -175,6 +179,7 @@ assert_compile(sizeof(uint8) == 1); #define GetString OTTD_GetString #define DrawString OTTD_DrawString #define Random OTTD_Random +#define CloseConnection OTTD_CloseConnection #endif #endif // !defined(_STDAFX_H) |