openttd-mini: comparison src/stdafx.h

equal deleted inserted replaced

-:c09d80249412
+:46e88dcb71ff
 #include <cstddef>
 #include <cstring>
 #include <cstdlib>
 #include <climits>
-// MacOS X will use an NSAlert to display failed assertaions since they're lost unless running from a terminal
+/* 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
+* strgen always runs from terminal and don't need a window for asserts */
 #if !defined(__APPLE__) || defined(STRGEN)
 # include <cassert>
 #else
 # include "os/macosx/macos.h"
 #endif
 #ifdef SUNOS
 # include <alloca.h>
 #endif
 #ifdef __MORPHOS__
-// morphos defines certain amiga defines per default, we undefine them
+/* MorphOS defines certain Amiga defines per default, we undefine them
-// here to make the rest of source less messy and more clear what is
+* here to make the rest of source less messy and more clear what is
-// required for morphos and what for amigaos
+* required for morphos and what for AmigaOS */
 # ifdef amigaos
 #  undef amigaos
 # endif
 # ifdef __amigaos__
 #  undef __amigaos__
 # endif
 #endif /* __MORPHOS__ */
 #ifdef __APPLE__
 # include "os/macosx/osx_stdafx.h"
-/* make endian swapping use Apple's macros to increase speed (since it will use hardware swapping if available)
+/* Make endian swapping use Apple's macros to increase speed (since it will use hardware swapping if available)
 * Even though they should return uint16 and uint32, we get warnings if we don't cast those (why?) */
 # define BSWAP32(x) ((uint32)Endian32_Swap(x))
 # define BSWAP16(x) ((uint16)Endian16_Swap(x))
 #else
 # define BSWAP32(x) ((((x) >> 24) & 0xFF) | (((x) >> 8) & 0xFF00) | (((x) << 8) & 0xFF0000) | (((x) << 24) & 0xFF000000))
 # define BSWAP16(x) ((x) >> 8 | (x) << 8)
 #endif /* __APPLE__ */
-// by default we use [] var arrays
+/* by default we use [] var arrays */
 #define VARARRAY_SIZE
-// Stuff for GCC
+/* Stuff for GCC */
 #if defined(__GNUC__)
 # define NORETURN __attribute__ ((noreturn))
 # define FORCEINLINE inline
 # define CDECL
 # define __int64 long long
 #if defined(__MINGW32__) || defined(__CYGWIN__)
 # include <malloc.h> // alloca()
 #endif
-// Stuff for MSVC
+/* Stuff for MSVC */
 #if defined(_MSC_VER)
 # pragma once
 # 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
 typedef _W64 unsigned int UINT_PTR, *PUINT_PTR;
 # endif /* WIN32 && !_WIN64 && !WIN64 */
 # define GCC_PACK
-// This is needed to zlib uses the stdcall calling convention on visual studio, also used with libpng (VS6 warning)
+/* This is needed to zlib uses the stdcall calling convention on visual studio */
 # if defined(WITH_ZLIB) || defined(WITH_PNG)
 #  ifndef ZLIB_WINAPI
 #   define ZLIB_WINAPI
 #  endif
 # endif
 # define strcasecmp stricmp
 # define strncasecmp strnicmp
-// suppress: warning C4005: 'offsetof' : macro redefinition (VC8)
+/* suppress: warning C4005: 'offsetof' : macro redefinition (VC8) */
 #endif /* defined(_MSC_VER) */
 #if defined(WINCE)
 # define strdup _strdup
 #endif /* WINCE */
 const char *FS2OTTD(const char *name);
 const char *OTTD2FS(const char *name);
 # endif /* WIN32 */
 #endif /* STRGEN */
-// Windows has always LITTLE_ENDIAN
+/* Windows has always LITTLE_ENDIAN */
 #if defined(WIN32) || defined(__OS2__) || defined(WIN64)
 # define TTD_LITTLE_ENDIAN
 #else
-// Else include endian[target/host].h, which has the endian-type, autodetected by the Makefile
+/* Else include endian[target/host].h, which has the endian-type, autodetected by the Makefile */
 # if defined(STRGEN)
 #  include "endian_host.h"
 # else
 #  include "endian_target.h"
 # endif
 # define PATHSEP "/"
 # define PATHSEPCHAR '/'
 #endif
 typedef unsigned char byte;
-#ifndef __BEOS__ // already defined
+#ifndef __BEOS__ /* already defined */
 typedef unsigned char uint8;
 typedef unsigned short uint16;
 typedef unsigned int uint32;
 #endif
-// This is already defined in unix
+/* This is already defined in unix */
 #if !defined(UNIX) && !defined(__CYGWIN__) && !defined(__BEOS__) && !defined(__MORPHOS__)
 typedef unsigned int uint;
 #endif
-// Not defined in QNX Neutrino (6.x)
+/* Not defined in QNX Neutrino (6.x) */
 #if defined(__QNXNTO__)
 typedef unsigned int uint;
 #endif
 #ifndef __BEOS__
-// some platforms use 4 bytes bool in C++
+/* some platforms use 4 bytes bool in C++
-// C bool has to be the same
+* C bool has to be the same */
 #	ifndef __cplusplus
 #		ifdef FOUR_BYTE_BOOL
 			typedef unsigned long bool;
 #		else /* FOUR_BYTE_BOOL */
 			typedef unsigned char bool;
 #if defined(ARM) || defined(__arm__) || defined(__alpha__)
 # define OTTD_ALIGNMENT
 #endif
-// Setup alignment and conversion macros
+/* Setup alignment and conversion macros */
 #if defined(TTD_BIG_ENDIAN)
 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); }
 static inline uint16 FROM_LE16(uint16 x) { return BSWAP16(x); }
 true = 1,
 };
 # endif
 #endif /* __cplusplus */
-// Compile time assertions
+/* Compile time assertions */
 #ifdef __OS2__
 # define assert_compile(expr)
 #else
 # ifdef __cplusplus
 #  define assert_compile(expr) extern "C" void __ct_assert__(int a[1 - 2 * !(expr)])
 #  define offsetof(s,m)       cpp_offsetof(s, m)
 # endif /* !__MORPHOS__ */
 #endif /* __cplusplus */
-// take care of some name clashes on macos
+/* take care of some name clashes on MacOS */
 #if defined(__APPLE__)
 # define GetString OTTD_GetString
 # define DrawString OTTD_DrawString
 # define Random OTTD_Random
 # define CloseConnection OTTD_CloseConnection
 #endif /* __APPLE */
 #ifdef __AMIGA__
-// it seems AmigaOS already have a Point declared
+/* it seems AmigaOS already have a Point declared */
 # define Point OTTD_AMIGA_POINT
 #endif
 #endif /* STDAFX_H */

changeset 5934	46e88dcb71ff
parent 5933	c09d80249412
child 5935	4583abb7d050