- Use a more conformant C++ preprocessor macro identifier for Unix systems.
The 'unix' identifier isn't defined when '-std' is passed to the compiler (tested with gcc and clang), so use '__unix__' which is well enough documented.
This commit is contained in:
parent
81334809c4
commit
4ce0574b3f
14 changed files with 23 additions and 23 deletions
|
|
@ -38,7 +38,7 @@
|
|||
#endif
|
||||
#include <float.h>
|
||||
|
||||
#if defined(unix) || defined(__APPLE__)
|
||||
#if defined(__unix__) || defined(__APPLE__)
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
|
|
@ -2009,7 +2009,7 @@ static void AddAutoloadFiles(const char *gamesection)
|
|||
D_AddFile (allwads, wad);
|
||||
|
||||
// [RH] Add any .wad files in the skins directory
|
||||
#ifdef unix
|
||||
#ifdef __unix__
|
||||
file = SHARE_DIR;
|
||||
#else
|
||||
file = progdir;
|
||||
|
|
@ -2017,7 +2017,7 @@ static void AddAutoloadFiles(const char *gamesection)
|
|||
file += "skins";
|
||||
D_AddDirectory (allwads, file);
|
||||
|
||||
#ifdef unix
|
||||
#ifdef __unix__
|
||||
file = NicePath("~/" GAME_DIR "/skins");
|
||||
D_AddDirectory (allwads, file);
|
||||
#endif
|
||||
|
|
@ -2137,7 +2137,7 @@ static void CheckCmdLine()
|
|||
Printf ("%s", GStrings("D_DEVSTR"));
|
||||
}
|
||||
|
||||
#if !defined(unix) && !defined(__APPLE__)
|
||||
#if !defined(__unix__) && !defined(__APPLE__)
|
||||
// We do not need to support -cdrom under Unix, because all the files
|
||||
// that would go to c:\\zdoomdat are already stored in .zdoom inside
|
||||
// the user's home directory.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue