changed some platform-related preprocessor definition names

diff --git a/src/events.c b/src/events.c
index 7a6ff377fd91440277c9db4986ad1e591c3dd430..4a31bcd6539140624d9e8f0c25f1f7523dc40fc7 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -585,7 +585,7 @@ void HandleWheelEvent(WheelEvent *event)
               event->y < 0 ? MB_WHEEL_DOWN :
               event->y > 0 ? MB_WHEEL_UP : 0);
 
-#if defined(PLATFORM_WIN32) || defined(PLATFORM_MACOSX)
+#if defined(PLATFORM_WINDOWS) || defined(PLATFORM_MAC)
   // accelerated mouse wheel available on Mac and Windows
   wheel_steps = (event->x ? ABS(event->x) : ABS(event->y));
 #else

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index 54e5bfd16b4822d7f682f3755aa6aac8e4952a66..7b82420cf6dade4071cbc3a4571ecfcf1b0ac408 100644 (file)
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -763,7 +763,7 @@ static unsigned int init_random_number_ext(int nr, int seed)
     // default random seed
     seed = (int)time(NULL);                    // seconds since the epoch
 
-#if !defined(PLATFORM_WIN32)
+#if !defined(PLATFORM_WINDOWS)
     // add some more randomness
     struct timeval current_time;
 
@@ -896,7 +896,7 @@ char *getLoginName(void)
 {
   static char *login_name = NULL;
 
-#if defined(PLATFORM_WIN32)
+#if defined(PLATFORM_WINDOWS)
   if (login_name == NULL)
   {
     unsigned long buffer_size = MAX_USERNAME_LEN + 1;
@@ -927,7 +927,7 @@ char *getRealName(void)
 {
   static char *real_name = NULL;
 
-#if defined(PLATFORM_WIN32)
+#if defined(PLATFORM_WINDOWS)
   if (real_name == NULL)
   {
     static char buffer[MAX_USERNAME_LEN + 1];
@@ -1543,7 +1543,7 @@ void GetOptions(int argc, char *argv[],
       if (option_arg == next_option)
        options_left++;
     }
-#if defined(PLATFORM_MACOSX)
+#if defined(PLATFORM_MAC)
     else if (strPrefix(option, "-psn"))
     {
       // ignore process serial number when launched via GUI on Mac OS X
@@ -1617,7 +1617,7 @@ void checked_free(void *ptr)
 
 void clear_mem(void *ptr, unsigned int size)
 {
-#if defined(PLATFORM_WIN32)
+#if defined(PLATFORM_WINDOWS)
   // for unknown reason, memset() sometimes crashes when compiled with MinGW
   char *cptr = (char *)ptr;
 
@@ -4201,7 +4201,7 @@ void DumpLogFile(int nr)
 
 void NotifyUserAboutErrorFile(void)
 {
-#if defined(PLATFORM_WIN32)
+#if defined(PLATFORM_WINDOWS)
   char *title_text = getStringCat2(program.program_title, " Error Message");
   char *error_text = getStringCat2("The program was aborted due to an error; "
                                   "for details, see the following error file:"

diff --git a/src/libgame/platform.h b/src/libgame/platform.h
index ee7bff30dcc1933d361f14d05fc2d40269ca1e96..b9c8a411090f80b5a91a3776d3732d9f2dfe8082 100644 (file)
--- a/src/libgame/platform.h
+++ b/src/libgame/platform.h
@@ -16,8 +16,8 @@
 // define main platform keywords
 // ============================================================================
 
-#if defined(WIN32) || defined(_WIN32)
-#define PLATFORM_WIN32
+#if defined(WIN32) || defined(_WIN32) || defined(_WIN64)
+#define PLATFORM_WINDOWS
 #define PLATFORM_STRING "Windows"
 #else
 #define PLATFORM_UNIX
@@ -86,7 +86,7 @@
 #endif
 
 #if defined(__APPLE__) && defined(__MACH__)
-#define PLATFORM_MACOSX
+#define PLATFORM_MAC
 #undef  PLATFORM_STRING
 #define PLATFORM_STRING "Mac"
 #endif

diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c
index b75f2c8c6e58f27c5c359bbf573df1cec32cc525..5be4c0dc173c9ea57455fcba7a3046eb8b88af36 100644 (file)
--- a/src/libgame/sdl.c
+++ b/src/libgame/sdl.c
@@ -264,7 +264,7 @@ static void SDLSetWindowIcon(char *basename)
   // (setting the window icon on Mac OS X would replace the high-quality
   // dock icon with the currently smaller (and uglier) icon from file)
 
-#if !defined(PLATFORM_MACOSX)
+#if !defined(PLATFORM_MAC)
   char *filename = getCustomImageFilename(basename);
   SDL_Surface *surface;
 

diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h
index a5271c8152a1597d81fd585d0465c3c51e9739d6..a45e68ec89ecd1d0898471943e14c55ae16275f1 100644 (file)
--- a/src/libgame/sdl.h
+++ b/src/libgame/sdl.h
@@ -17,7 +17,7 @@
 #include <SDL_mixer.h>
 #include <SDL_net.h>
 #include <SDL_thread.h>
-#if defined(PLATFORM_WIN32)
+#if defined(PLATFORM_WINDOWS)
 #include <SDL_syswm.h>
 #endif
 

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index 8da478a3656126dc45d00570b53e3db3ee3562ea..58e13b6bb87e0929e3d0a9a1a27bebdc37725696 100644 (file)
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -516,7 +516,7 @@ char *getProgramMainDataPath(char *command_filename, char *base_path)
      set the current working directory to the program package directory) */
   char *main_data_path = getBasePath(command_filename);
 
-#if defined(PLATFORM_MACOSX)
+#if defined(PLATFORM_MAC)
   if (strSuffix(main_data_path, MAC_APP_BINARY_SUBDIR))
   {
     char *main_data_path_old = main_data_path;
@@ -1785,7 +1785,7 @@ void sortTreeInfo(TreeInfo **node_first)
 // some stuff from "files.c"
 // ============================================================================
 
-#if defined(PLATFORM_WIN32)
+#if defined(PLATFORM_WINDOWS)
 #ifndef S_IRGRP
 #define S_IRGRP S_IRUSR
 #endif
@@ -1810,7 +1810,7 @@ void sortTreeInfo(TreeInfo **node_first)
 #ifndef S_ISGID
 #define S_ISGID 0
 #endif
-#endif // PLATFORM_WIN32
+#endif // PLATFORM_WINDOWS
 
 // file permissions for newly written files
 #define MODE_R_ALL             (S_IRUSR | S_IRGRP | S_IROTH)
@@ -1834,7 +1834,7 @@ char *getHomeDir(void)
 {
   static char *dir = NULL;
 
-#if defined(PLATFORM_WIN32)
+#if defined(PLATFORM_WINDOWS)
   if (dir == NULL)
   {
     dir = checked_malloc(MAX_PATH + 1);
@@ -1868,7 +1868,7 @@ char *getPersonalDataDir(void)
 {
   static char *personal_data_dir = NULL;
 
-#if defined(PLATFORM_MACOSX)
+#if defined(PLATFORM_MAC)
   if (personal_data_dir == NULL)
     personal_data_dir = getPath2(getHomeDir(), "Documents");
 #else
@@ -1922,7 +1922,7 @@ static mode_t posix_umask(mode_t mask)
 
 static int posix_mkdir(const char *pathname, mode_t mode)
 {
-#if defined(PLATFORM_WIN32)
+#if defined(PLATFORM_WINDOWS)
   return mkdir(pathname);
 #else
   return mkdir(pathname, mode);

diff --git a/src/libgame/sound.c b/src/libgame/sound.c
index d7ec950435948b44fdb2560c7f26c103ad7904f6..12b01c382b8f1c50cd62403b9ce65317fa9e8840 100644 (file)
--- a/src/libgame/sound.c
+++ b/src/libgame/sound.c
@@ -233,7 +233,7 @@ static void Mixer_PlayMusicChannel(void)
     Mix_VolumeMusic(mixer[audio.music_channel].volume);
     Mix_FadeInMusic(mixer[audio.music_channel].data_ptr, loops, 100);
 
-#if defined(PLATFORM_WIN32)
+#if defined(PLATFORM_WINDOWS)
     // playing MIDI music is broken since Windows Vista, as it sets the volume
     // for MIDI music also for all other sounds and music, which cannot be set
     // back to normal unless playing MIDI music again with that desired volume
@@ -281,7 +281,7 @@ static void Mixer_FadeMusicChannel(void)
 
   Mix_FadeOutMusic(SOUND_FADING_INTERVAL);
 
-#if defined(PLATFORM_WIN32)
+#if defined(PLATFORM_WINDOWS)
   // playing MIDI music is broken since Windows Vista, as it sets the volume
   // for MIDI music also for all other sounds and music, which cannot be set
   // back to normal unless playing MIDI music again with that desired volume

diff --git a/src/libgame/sound.h b/src/libgame/sound.h
index a2a6599936b86e56b0ebfeb734a5d5802d5beb63..190c441e735e24fc002b2e957d79d239c7a31ee9 100644 (file)
--- a/src/libgame/sound.h
+++ b/src/libgame/sound.h
@@ -35,7 +35,7 @@
 
 #define DEFAULT_AUDIO_SAMPLE_RATE      AUDIO_SAMPLE_RATE_22050
 
-#if defined(PLATFORM_WIN32)
+#if defined(PLATFORM_WINDOWS)
 #define DEFAULT_AUDIO_FRAGMENT_SIZE    AUDIO_FRAGMENT_SIZE_1024
 #else
 #define DEFAULT_AUDIO_FRAGMENT_SIZE    AUDIO_FRAGMENT_SIZE_512

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 60a2d7cc40b369ab302cd645f6e282ba903db3b0..4b57594d55409699b9feb4287369bd2cc79ee180 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -16,9 +16,9 @@
 #include "types.h"
 
 
-#if defined(PLATFORM_MACOSX)
+#if defined(PLATFORM_MAC)
 #include "macosx.h"
-#elif defined(PLATFORM_WIN32)
+#elif defined(PLATFORM_WINDOWS)
 #include "windows.h"
 #elif defined(PLATFORM_ANDROID)
 #include "android.h"
@@ -163,7 +163,7 @@
 #define DEFAULT_KEY_RIGHT              KSYM_Right
 #define DEFAULT_KEY_UP                 KSYM_Up
 #define DEFAULT_KEY_DOWN               KSYM_Down
-#if defined(PLATFORM_MACOSX)
+#if defined(PLATFORM_MAC)
 #define DEFAULT_KEY_SNAP               KSYM_Control_L
 #define DEFAULT_KEY_DROP               KSYM_KP_Enter
 #else
@@ -722,7 +722,7 @@
 #define STRING_NEWLINE_UNIX            "\n"
 #define STRING_NEWLINE_DOS             "\r\n"
 
-#if defined(PLATFORM_WIN32)
+#if defined(PLATFORM_WINDOWS)
 #define CHAR_PATH_SEPARATOR    CHAR_PATH_SEPARATOR_DOS
 #define STRING_PATH_SEPARATOR  STRING_PATH_SEPARATOR_DOS
 #define STRING_NEWLINE         STRING_NEWLINE_DOS

diff --git a/src/libgame/types.h b/src/libgame/types.h
index 62752f1fe8007ca150a4c3513a97c03e97cda56d..9fb00ec7f09b2719be6f79991ea4e3960bd81381 100644 (file)
--- a/src/libgame/types.h
+++ b/src/libgame/types.h
@@ -19,7 +19,7 @@
 #include <sys/types.h>
 
 
-#if !defined(PLATFORM_WIN32)
+#if !defined(PLATFORM_WINDOWS)
 typedef int boolean;
 typedef unsigned char byte;
 #endif

diff --git a/src/main.c b/src/main.c
index 1cf3c9e6162e9fd429edf1440630a2cab189fa64..a4c95d26d0cabc1219aabfc2b98624155df29c2b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -7831,7 +7831,7 @@ static void InitProgramConfig(char *command_filename)
       strlen(setup.internal.program_icon_file) > 0)
     program_icon_file = getStringCopy(setup.internal.program_icon_file);
 
-#if defined(PLATFORM_WIN32) || defined(PLATFORM_MACOSX) || defined(PLATFORM_EMSCRIPTEN)
+#if defined(PLATFORM_WINDOWS) || defined(PLATFORM_MAC) || defined(PLATFORM_EMSCRIPTEN)
   userdata_subdir = program_title;
 #elif defined(PLATFORM_UNIX)
   userdata_subdir = getStringCat2(".", userdata_basename);

diff --git a/src/tools.c b/src/tools.c
index bbfd5c156bee98811d51565b6860c1acb692a91d..f3f6a33bee60f968357a43a00d22eccc0db4cdf9 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -9976,7 +9976,7 @@ void OpenURLFromHash(SetupFileHash *hash, int hash_key)
 // tests
 // ============================================================================
 
-#if defined(PLATFORM_WIN32)
+#if defined(PLATFORM_WINDOWS)
 /* FILETIME of Jan 1 1970 00:00:00. */
 static const unsigned __int64 epoch = ((unsigned __int64) 116444736000000000ULL);
 
@@ -10030,7 +10030,7 @@ static char *test_init_uuid_random_function_better(void)
   return seed_text;
 }
 
-#if defined(PLATFORM_WIN32)
+#if defined(PLATFORM_WINDOWS)
 static char *test_init_uuid_random_function_better_windows(void)
 {
   static char seed_text[100];
@@ -10058,7 +10058,7 @@ static unsigned int test_uuid_random_function_better(int max)
   return (max > 0 ? prng_get_uint() % max : 0);
 }
 
-#if defined(PLATFORM_WIN32)
+#if defined(PLATFORM_WINDOWS)
 #define NUM_UUID_TESTS                 3
 #else
 #define NUM_UUID_TESTS                 2
@@ -10085,7 +10085,7 @@ static void TestGeneratingUUIDs_RunTest(int nr, int always_seed, int num_uuids)
      test_uuid_random_function_better);
   int xpos = 40;
 
-#if defined(PLATFORM_WIN32)
+#if defined(PLATFORM_WINDOWS)
   if (nr == 2)
   {
     random_name = "windows";