Merge pull request #492 from tophyr/pr/posix-defines

Use `POSIX` instead of `__LINUX__` for general OS checks

Author: winterheart

CMakeLists.txt

@@ -103,11 +103,11 @@ message("SDL2 Include Dir is ${SDL2_INCLUDE_DIR} ${SDL2_INCLUDE_DIRS}")
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
   message("Building for Linux")
-  add_compile_definitions(__LINUX__ _USE_OGL_ACTIVE_TEXTURES PRIMARY_HOG=\"d3-linux.hog\")
+  add_compile_definitions(POSIX __LINUX__ _USE_OGL_ACTIVE_TEXTURES PRIMARY_HOG=\"d3-linux.hog\")
   set(PLATFORM_INCLUDES "lib/linux" ${SDL2_INCLUDE_DIR} ${SDL2_INCLUDE_DIRS})
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   message("Building for MAC OSX")
-  add_compile_definitions(__LINUX__ MACOSX=1 _USE_OGL_ACTIVE_TEXTURES PRIMARY_HOG=\"d3-osx.hog\")
+  add_compile_definitions(POSIX MACOSX=1 _USE_OGL_ACTIVE_TEXTURES PRIMARY_HOG=\"d3-osx.hog\")
   set(PLATFORM_INCLUDES "lib/linux" ${SDL2_INCLUDE_DIR} ${SDL2_INCLUDE_DIRS})
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   # Windows.h defines to avoid as many issues as possible.

Descent3/BriefingParse.h

@@ -50,7 +50,7 @@
 #ifndef __BRIEFPARSE_H_
 #define __BRIEFPARSE_H_
 
-#if defined(__LINUX__)
+#if defined(POSIX)
 #include "linux_fix.h" //for stricmp
 #endif
 

Descent3/ConfigItem.h

@@ -58,7 +58,7 @@
 
 #include "newui.h"
 
-#if defined(__LINUX__)
+#if defined(POSIX)
 void CIListBoxCallback(int ID, void *);
 void CISliderCallback(int ID, void *);
 #endif

Descent3/Game2DLL.cpp

@@ -92,7 +92,7 @@ struct game_api {
   tOSIRISModuleInit *osiris_functions;
 };
 // The exported DLL function call prototypes
-#if defined(__LINUX__)
+#if defined(POSIX)
 typedef void DLLFUNCCALL (*DLLGameCall_fp)(int eventnum, dllinfo *data);
 typedef void DLLFUNCCALL (*DLLGameInit_fp)(int *api_func, uint8_t *all_ok, int num_teams_to_use);
 typedef void DLLFUNCCALL (*DLLGameClose_fp)();

Descent3/LoadLevel.cpp

@@ -3240,7 +3240,7 @@ void ReadTerrainSkyAndLightChunk(CFILE *fp, int version) {
 
   Terrain_sky.flags = cf_ReadInt(fp);
 
-#ifdef __LINUX__
+#if defined(POSIX)
   if (FindArg("-noterrainfog") > 0) {
     Terrain_sky.flags &= ~TF_FOG;
   }

Descent3/Mission.cpp

@@ -1694,12 +1694,12 @@ void InitLevelScript() {
     ddio_SplitPath(Current_level->filename, NULL, filename, ext);
 #if defined(WIN32)
     strcat(filename, ".dll");
-#else
-#if defined(MACOSX)
+#elif defined(MACOSX)
     strcat(filename, ".dylib");
-#else
+#elif defined(__LINUX__)
     strcat(filename, ".so");
-#endif
+#else
+    #error Unsupported platform!
 #endif
     Osiris_LoadLevelModule(filename);
   }

Descent3/OsirisLoadandBind.cpp

@@ -438,7 +438,7 @@ bool Show_osiris_debug = false;
        // 0, only when the level ends
 
 // The exported DLL function call prototypes
-#if defined(__LINUX__)
+#if defined(POSIX)
 typedef char DLLFUNCCALL (*InitializeDLL_fp)(tOSIRISModuleInit *function_list);
 typedef void DLLFUNCCALL (*ShutdownDLL_fp)(void);
 typedef int DLLFUNCCALL (*GetGOScriptID_fp)(const char *name, uint8_t isdoor);
@@ -3144,14 +3144,14 @@ int Osiris_ExtractScriptsFromHog(int library_handle, bool is_mission_hog) {
   int count = 0;
 
   const char *script_extension;
-#if defined(__LINUX__)
 #if defined(MACOSX)
   script_extension = "*.dylib";
-#else
+#elif defined(__LINUX__)
   script_extension = "*.so";
-#endif
-#else
+#elif defined(WIN32)
   script_extension = "*.dll";
+#else
+  #error Unsupported platform!
 #endif
 
   int index;
@@ -4037,4 +4037,3 @@ void Osiris_CreateModuleInitStruct(tOSIRISModuleInit *mi) {
     mi->fp[i] = NULL;
   }
 }
-

Descent3/config.cpp

@@ -679,7 +679,7 @@ struct video_menu {
     sheet->AddLongRadioButton("1600x1200");
     *resolution = iTemp;
 
-#if !defined(__LINUX__)
+#if !defined(POSIX)
     // renderer bit depth
     switch (Render_preferred_bitdepth) {
     case 16:
@@ -708,7 +708,7 @@ struct video_menu {
 
     sheet->NewGroup(TXT_MONITOR, 0, 180);
     vsync = sheet->AddLongCheckBox(TXT_CFG_VSYNCENABLED, (Render_preferred_state.vsync_on != 0));
-#ifndef __LINUX__
+#if !defined(POSIX)
     sheet->AddText("");
     sheet->AddLongButton(TXT_AUTO_GAMMA, IDV_AUTOGAMMA);
 #endif
@@ -723,7 +723,7 @@ struct video_menu {
       Render_preferred_state.mipping = (*mipmapping) ? 1 : 0;
     if (vsync)
       Render_preferred_state.vsync_on = (*vsync) ? 1 : 0;
-#if !defined(__LINUX__)
+#if !defined(POSIX)
     if (bitdepth)
       Render_preferred_bitdepth = (*bitdepth) == 1 ? 32 : 16;
 #endif
@@ -753,7 +753,7 @@ struct video_menu {
 
   // process
   void process(int res) {
-#ifndef __LINUX__
+#if !defined(POSIX)
     switch (res) {
     case IDV_AUTOGAMMA:
       config_gamma();

Descent3/credits.cpp

@@ -94,7 +94,7 @@
 #include <math.h>
 #include "psrand.h"
 
-#if defined(__LINUX__)
+#if defined(POSIX)
 #include "linux_fix.h"
 #endif
 

Descent3/dedicated_server.cpp

@@ -108,7 +108,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifndef __LINUX__
+#if !defined(POSIX)
 typedef int socklen_t;
 #endif
 
@@ -788,7 +788,7 @@ void PrintDedicatedMessage(const char *fmt, ...) {
   DedicatedSocketputs(buf);
 }
 
-#ifdef __LINUX__
+#if defined(POSIX)
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>