From 639f19adbfce5e21bbae2bebe515914330d2bcd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sat, 9 Jul 2016 10:05:12 +0200 Subject: [PATCH] Fix define checks in project --- src/addresses.h | 2 +- src/cmdline/RootCommands.cpp | 2 +- src/common.h | 4 ++-- src/core/Path.cpp | 4 ++-- src/drawing/drawing.c | 2 +- src/drawing/drawing.h | 2 +- src/drawing/sprite.c | 8 ++++---- src/interface/viewport.c | 4 ++-- src/interface/viewport.h | 2 +- src/object_list.c | 2 +- src/object_list.h | 2 +- src/openrct2.c | 2 +- src/scenario.c | 2 +- src/util/util.c | 4 ++-- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/addresses.h b/src/addresses.h index c1e333f428..dce3c23723 100644 --- a/src/addresses.h +++ b/src/addresses.h @@ -440,7 +440,7 @@ #pragma endregion #pragma region Obsolete -#if USE_OBSOLETE_ADDRESSES +#ifdef USE_OBSOLETE_ADDRESSES // The following addresses relate to memory locations that no longer used by // OpenRCT2. This may be due to the data at those locations being stored in diff --git a/src/cmdline/RootCommands.cpp b/src/cmdline/RootCommands.cpp index 89f0a29571..64af14926c 100644 --- a/src/cmdline/RootCommands.cpp +++ b/src/cmdline/RootCommands.cpp @@ -411,7 +411,7 @@ static void PrintVersion() openrct2_write_full_version_info(buffer, sizeof(buffer)); Console::WriteLine(buffer); Console::WriteFormat("%s (%s)", OPENRCT2_PLATFORM, OPENRCT2_ARCHITECTURE); -#if NO_RCT2 +#ifdef NO_RCT2 Console::Write(" (NO_RCT2)"); #endif Console::WriteLine(); diff --git a/src/common.h b/src/common.h index 9e6435a3df..8759d7d03b 100644 --- a/src/common.h +++ b/src/common.h @@ -47,13 +47,13 @@ // aliasing the same memory area. Using it lets compiler generate better code. If your compiler // does not support it, feel free to drop it, at some performance hit. #ifdef __cplusplus - #if _MSC_VER + #ifdef _MSC_VER #define RESTRICT __restrict #else #define RESTRICT __restrict__ #endif #else - #if _MSC_VER + #ifdef _MSC_VER #define RESTRICT __restrict #else #define RESTRICT restrict diff --git a/src/core/Path.cpp b/src/core/Path.cpp index 65d0e8a830..1e368e46d4 100644 --- a/src/core/Path.cpp +++ b/src/core/Path.cpp @@ -119,7 +119,7 @@ namespace Path utf8 * GetAbsolute(utf8 *buffer, size_t bufferSize, const utf8 * relativePath) { -#if __WINDOWS__ +#ifdef __WINDOWS__ wchar_t * relativePathW = utf8_to_widechar(relativePath); wchar_t absolutePathW[MAX_PATH]; DWORD length = GetFullPathNameW(relativePathW, Util::CountOf(absolutePathW), absolutePathW, NULL); @@ -153,7 +153,7 @@ namespace Path bool Equals(const utf8 * a, const utf8 * b) { bool ignoreCase = false; -#if __WINDOWS__ +#ifdef __WINDOWS__ ignoreCase = true; #endif return String::Equals(a, b, ignoreCase); diff --git a/src/drawing/drawing.c b/src/drawing/drawing.c index 55eb628397..2d371cad0a 100644 --- a/src/drawing/drawing.c +++ b/src/drawing/drawing.c @@ -37,7 +37,7 @@ sint32 gPickupPeepY; void *unk_9ABDA4; void *unk_9E3CDC; void *unk_9E3CE4[8]; -#if NO_RCT2 +#ifdef NO_RCT2 rct_drawpixelinfo *unk_140E9A8; #endif diff --git a/src/drawing/drawing.h b/src/drawing/drawing.h index 04367bc40e..f0461687e0 100644 --- a/src/drawing/drawing.h +++ b/src/drawing/drawing.h @@ -140,7 +140,7 @@ extern rct_drawpixelinfo gWindowDPI; extern void *unk_9ABDA4; extern void *unk_9E3CDC; extern void *unk_9E3CE4[8]; -#if NO_RCT2 +#ifdef NO_RCT2 extern rct_drawpixelinfo *unk_140E9A8; #else #define unk_140E9A8 RCT2_GLOBAL(0x0140E9A8, rct_drawpixelinfo*) diff --git a/src/drawing/sprite.c b/src/drawing/sprite.c index 26458bb1ab..fefb338e26 100644 --- a/src/drawing/sprite.c +++ b/src/drawing/sprite.c @@ -25,7 +25,7 @@ void *_g1Buffer = NULL; rct_gx g2; -#if NO_RCT2 +#ifdef NO_RCT2 rct_g1_element *g1Elements = NULL; #else rct_g1_element *g1Elements = (rct_g1_element*)RCT2_ADDRESS_G1_ELEMENTS; @@ -92,7 +92,7 @@ int gfx_load_g1() header.num_entries = 29294; // Read element headers -#if NO_RCT2 +#ifdef NO_RCT2 g1Elements = calloc(324206, sizeof(rct_g1_element)); #endif @@ -122,7 +122,7 @@ int gfx_load_g1() void gfx_unload_g1() { SafeFree(_g1Buffer); -#if NO_RCT2 +#ifdef NO_RCT2 SafeFree(g1Elements); #endif } @@ -367,7 +367,7 @@ void FASTCALL gfx_draw_sprite_software(rct_drawpixelinfo *dpi, int image_id, int uint32 primary_offset = palette_to_g1_offset[(image_id >> 19) & 0x1F]; uint32 secondary_offset = palette_to_g1_offset[(image_id >> 24) & 0x1F]; -#if DEBUG_LEVEL_2 +#ifdef DEBUG_LEVEL_2 assert(tertiary_colour < PALETTE_TO_G1_OFFSET_COUNT); #endif // DEBUG_LEVEL_2 uint32 tertiary_offset = palette_to_g1_offset[tertiary_colour]; diff --git a/src/interface/viewport.c b/src/interface/viewport.c index 6ef0f0a0b4..d61ea42577 100644 --- a/src/interface/viewport.c +++ b/src/interface/viewport.c @@ -41,7 +41,7 @@ rct_viewport g_viewport_list[MAX_VIEWPORT_COUNT]; -#if NO_RCT2 +#ifdef NO_RCT2 paint_struct *unk_EE7884; paint_struct *unk_EE7888; #endif @@ -1598,7 +1598,7 @@ uint8 get_current_rotation() { uint8 rotation = gCurrentRotation; uint8 rotation_masked = rotation & 3; -#if DEBUG_LEVEL_1 +#ifdef DEBUG_LEVEL_1 if (rotation != rotation_masked) { log_error("Found wrong rotation %d! Will return %d instead.", (uint32)rotation, (uint32)rotation_masked); } diff --git a/src/interface/viewport.h b/src/interface/viewport.h index 6e906ee691..1ed9112f47 100644 --- a/src/interface/viewport.h +++ b/src/interface/viewport.h @@ -96,7 +96,7 @@ typedef struct viewport_interaction_info { // rct2: 0x014234BC extern rct_viewport g_viewport_list[MAX_VIEWPORT_COUNT]; -#if NO_RCT2 +#ifdef NO_RCT2 extern paint_struct *unk_EE7884; extern paint_struct *unk_EE7888; #else diff --git a/src/object_list.c b/src/object_list.c index 19cbc4f301..34d866cfb6 100644 --- a/src/object_list.c +++ b/src/object_list.c @@ -72,7 +72,7 @@ int object_entry_group_encoding[] = { CHUNK_ENCODING_ROTATE }; -#if NO_RCT2 +#ifdef NO_RCT2 rct_ride_entry *gRideEntries[128]; rct_small_scenery_entry *gSmallSceneryEntries[252]; rct_large_scenery_entry *gLargeSceneryEntries[128]; diff --git a/src/object_list.h b/src/object_list.h index 34b360b88e..9b9b6effc7 100644 --- a/src/object_list.h +++ b/src/object_list.h @@ -7,7 +7,7 @@ #include "world/scenery.h" #include "world/water.h" -#if NO_RCT2 +#ifdef NO_RCT2 extern rct_ride_entry *gRideEntries[128]; extern rct_small_scenery_entry *gSmallSceneryEntries[252]; extern rct_large_scenery_entry *gLargeSceneryEntries[128]; diff --git a/src/openrct2.c b/src/openrct2.c index fcfe3fee32..9838aecbf8 100644 --- a/src/openrct2.c +++ b/src/openrct2.c @@ -597,7 +597,7 @@ static void openrct2_setup_rct2_hooks() // None for now } -#if _MSC_VER >= 1900 +#if defined(_MSC_VER) && (_MSC_VER >= 1900) /** * Temporary fix for libraries not compiled with VS2015 */ diff --git a/src/scenario.c b/src/scenario.c index d576cfc5c4..e8f5f7278f 100644 --- a/src/scenario.c +++ b/src/scenario.c @@ -600,7 +600,7 @@ static int scenario_create_ducks() */ unsigned int scenario_rand() { -#if DEBUG_DESYNC +#ifdef DEBUG_DESYNC if (!gInUpdateCode) { log_warning("scenario_rand called from outside game update"); assert(false); diff --git a/src/util/util.c b/src/util/util.c index bb8d08f6fe..a13b034f1d 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -168,11 +168,11 @@ bool readentirefile(const utf8 *path, void **outBuffer, int *outLength) int bitscanforward(int source) { - #if _MSC_VER >= 1400 // Visual Studio 2005 + #if defined(_MSC_VER) && (_MSC_VER >= 1400) // Visual Studio 2005 int i; uint8 success = _BitScanForward(&i, source); return success != 0 ? i : -1; - #elif __GNUC__ + #elif defined(__GNUC__) int success = __builtin_ffs(source); return success - 1; #else