- 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:
Edoardo Prezioso 2013-07-30 11:45:42 +02:00
commit 4ce0574b3f
14 changed files with 23 additions and 23 deletions

View file

@ -333,7 +333,7 @@ static long ParseCommandLine (const char *args, int *argc, char **argv)
}
#if defined(unix)
#if defined(__unix__)
FString GetUserFile (const char *file)
{
FString path;
@ -698,7 +698,7 @@ void M_ScreenShot (const char *filename)
// find a file name to save it to
if (filename == NULL || filename[0] == '\0')
{
#if !defined(unix) && !defined(__APPLE__)
#if !defined(__unix__) && !defined(__APPLE__)
if (Args->CheckParm ("-cdrom"))
{
autoname = CDROM_DIR "\\";
@ -715,7 +715,7 @@ void M_ScreenShot (const char *filename)
dirlen = autoname.Len();
if (dirlen == 0)
{
#ifdef unix
#ifdef __unix__
autoname = "~/" GAME_DIR "/screenshots/";
#elif defined(__APPLE__)
char cpath[PATH_MAX];