mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-01-22 23:26:34 +00:00
(svn r3011) Refix last revision's fix of VS6 which broke compilation on MinGW. Also beautify stdafx.h with nice indentation and comments after big #ifdef blocks. Hope it didn't break compilation on any OS's.
This commit is contained in:
Darkvater
parent
db3b1228bf
commit
01559c99b1
43
stdafx.h
43
stdafx.h
@ -5,7 +5,6 @@
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma once
|
||||
|
||||
# define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
|
||||
# pragma warning(disable: 4018) // 'expression' : signed/unsigned mismatch
|
||||
# pragma warning(disable: 4100) // 'identifier' : unreferenced formal parameter
|
||||
@ -17,7 +16,7 @@
|
||||
# pragma warning(disable: 4305) // 'identifier' : truncation from 'type1' to 'type2'
|
||||
# pragma warning(disable: 4514) // 'function' : unreferenced inline function has been removed
|
||||
# pragma warning(disable: 4761) // integral size mismatch in argument : conversion supplied
|
||||
#endif
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
@ -90,7 +89,7 @@
|
||||
# undef VARARRAY_SIZE
|
||||
# define VARARRAY_SIZE 0
|
||||
# endif
|
||||
#endif
|
||||
#endif /* __GNUC__ */
|
||||
|
||||
#if defined(__WATCOMC__)
|
||||
# define NORETURN
|
||||
@ -100,9 +99,8 @@
|
||||
# define GCC_PACK
|
||||
# undef TTD_ALIGNMENT_4
|
||||
# undef TTD_ALIGNMENT_2
|
||||
|
||||
# include <malloc.h>
|
||||
#endif
|
||||
#endif /* __WATCOMC__ */
|
||||
|
||||
#if defined(__MINGW32__) || defined(__CYGWIN__)
|
||||
# include <malloc.h> // alloca()
|
||||
@ -119,34 +117,33 @@
|
||||
# define NOT_REACHED() assert(0)
|
||||
# else
|
||||
# define NOT_REACHED() _assume(0)
|
||||
# endif
|
||||
# endif /* _DEBUG */
|
||||
int CDECL snprintf(char *str, size_t size, const char *format, ...);
|
||||
# if _MSC_VER < 1400
|
||||
int CDECL vsnprintf(char *str, size_t size, const char *format, va_list ap);
|
||||
# endif
|
||||
# undef TTD_ALIGNMENT_4
|
||||
# undef TTD_ALIGNMENT_2
|
||||
# define GCC_PACK
|
||||
#endif
|
||||
|
||||
// Needed for old PlatformSDK versions (e.g. VC6)
|
||||
# if defined(WIN32) && !defined(_WIN64) && !defined(WIN64)
|
||||
# ifndef _W64
|
||||
# define _W64
|
||||
# endif
|
||||
typedef _W64 int INT_PTR, *PINT_PTR;
|
||||
typedef _W64 unsigned int UINT_PTR, *PUINT_PTR;
|
||||
# endif /* WIN32 && !_WIN64 && !WIN64 */
|
||||
|
||||
#ifndef _INTPTR_T_DEFINED
|
||||
# if _MSC_VER < 1300 // VC6 and lower
|
||||
# ifdef _WIN64
|
||||
typedef __int64 intptr_t;
|
||||
# else
|
||||
typedef _W64 int intptr_t;
|
||||
# endif
|
||||
#define _INTPTR_T_DEFINED
|
||||
#endif
|
||||
# endif /* _MSC_VER < 1300 */
|
||||
|
||||
# undef TTD_ALIGNMENT_4
|
||||
# undef TTD_ALIGNMENT_2
|
||||
# define GCC_PACK
|
||||
#endif /* defined(_MSC_VER) */
|
||||
|
||||
#endif
|
||||
|
||||
// Windows has always LITTLE_ENDIAN
|
||||
#if defined(WIN32) || defined(__OS2__) || defined(WIN64)
|
||||
@ -158,7 +155,7 @@ typedef _W64 int intptr_t;
|
||||
# else
|
||||
# include "endian_target.h"
|
||||
# endif
|
||||
#endif
|
||||
#endif /* WIN32 || __OS2__ || WIN64 */
|
||||
|
||||
#if defined(UNIX)
|
||||
# define PATHSEP "/"
|
||||
@ -166,7 +163,6 @@ typedef _W64 int intptr_t;
|
||||
# define PATHSEP "\\"
|
||||
#endif
|
||||
|
||||
|
||||
typedef unsigned char byte;
|
||||
#ifndef __BEOS__ // already defined
|
||||
typedef unsigned char uint8;
|
||||
@ -192,14 +188,12 @@ typedef unsigned char bool;
|
||||
# endif
|
||||
typedef signed __int64 int64;
|
||||
typedef unsigned __int64 uint64;
|
||||
#endif
|
||||
#endif /* __BEOS__ */
|
||||
|
||||
// Setup alignment and conversion macros
|
||||
#if defined(TTD_BIG_ENDIAN)
|
||||
|
||||
# define TTD_ALIGNMENT_2
|
||||
# define TTD_ALIGNMENT_4
|
||||
|
||||
static inline uint32 TO_LE32(uint32 x) { return BSWAP32(x); }
|
||||
static inline uint16 TO_LE16(uint16 x) { return BSWAP16(x); }
|
||||
static inline uint32 FROM_LE32(uint32 x) { return BSWAP32(x); }
|
||||
@ -209,9 +203,7 @@ static inline uint16 FROM_LE16(uint16 x) { return BSWAP16(x); }
|
||||
# define FROM_BE32(x) x
|
||||
# define FROM_BE16(x) x
|
||||
# define TO_BE32X(x) x
|
||||
|
||||
#else
|
||||
|
||||
static inline uint32 TO_BE32(uint32 x) { return BSWAP32(x); }
|
||||
static inline uint16 TO_BE16(uint16 x) { return BSWAP16(x); }
|
||||
static inline uint32 FROM_BE32(uint32 x) { return BSWAP32(x); }
|
||||
@ -221,8 +213,7 @@ static inline uint16 FROM_BE16(uint16 x) { return BSWAP16(x); }
|
||||
# define TO_BE32X(x) BSWAP32(x)
|
||||
# define FROM_LE32(x) x
|
||||
# define FROM_LE16(x) x
|
||||
|
||||
#endif
|
||||
#endif /* TTD_BIG_ENDIAN */
|
||||
|
||||
#if !defined(GAME_DATA_DIR)
|
||||
# define GAME_DATA_DIR ""
|
||||
@ -239,7 +230,7 @@ enum {
|
||||
true = 1,
|
||||
};
|
||||
# endif
|
||||
#endif
|
||||
#endif /* __cplusplus */
|
||||
|
||||
// Compile time assertions
|
||||
#ifdef __OS2__
|
||||
@ -266,7 +257,7 @@ assert_compile(sizeof(uint8) == 1);
|
||||
# define DrawString OTTD_DrawString
|
||||
# define Random OTTD_Random
|
||||
# define CloseConnection OTTD_CloseConnection
|
||||
#endif
|
||||
#endif /* __APPLE */
|
||||
|
||||
#ifdef __AMIGA__
|
||||
// it seems AmigaOS already have a Point declared
|
||||
|
||||
Loading…
Reference in New Issue
Block a user