From 6e1aa25e78c63f29d280e183ba708e08f57e80eb Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Wed, 7 Dec 2016 06:55:04 +0000 Subject: [PATCH] sync'ed arch_defs.h and filenames.h with uhexen2 tree (for sake of symmetry.) git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1363 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/arch_def.h | 12 ++++++------ Quake/filenames.h | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Quake/arch_def.h b/Quake/arch_def.h index 775e4d6a..874268f6 100644 --- a/Quake/arch_def.h +++ b/Quake/arch_def.h @@ -6,7 +6,7 @@ * - shouldn't depend on compiler.h, q_stdinc.h, or * any other headers * - * Copyright (C) 2007-2012 O.Sezer + * Copyright (C) 2007-2016 O.Sezer * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,11 +24,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ARCH_DEFS__ -#define __ARCH_DEFS__ +#ifndef ARCHDEFS_H +#define ARCHDEFS_H -#if defined(__DJGPP__) || defined(MSDOS) || defined(__MSDOS__) || defined(__DOS__) +#if defined(__DJGPP__) || defined(__MSDOS__) || defined(__DOS__) || defined(_MSDOS) # if !defined(PLATFORM_DOS) # define PLATFORM_DOS 1 @@ -40,7 +40,7 @@ # define PLATFORM_OS2 1 # endif -#elif defined(_WIN32) || defined(_WIN64) +#elif defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) || defined(__NT__) || defined(_Windows) # if !defined(PLATFORM_WINDOWS) # define PLATFORM_WINDOWS 1 @@ -166,5 +166,5 @@ # warning "Platform is UNKNOWN." #endif /* PLATFORM_STRING */ -#endif /* __ARCH_DEFS__ */ +#endif /* ARCHDEFS_H */ diff --git a/Quake/filenames.h b/Quake/filenames.h index c9f34356..9e4c78ff 100644 --- a/Quake/filenames.h +++ b/Quake/filenames.h @@ -30,9 +30,10 @@ #include /* ---------------------- Windows, DOS, OS2: ---------------------- */ -#if defined(__MSDOS__) || defined(MSDOS) || defined(__DOS__) || \ - defined(__DJGPP__) || defined(__OS2__) || defined(__EMX__) || \ - defined(_WIN32) || defined(__CYGWIN__) +#if defined(__MSDOS__) || defined(__DOS__) || defined(__DJGPP__) || \ + defined(_MSDOS) || defined(__OS2__) || defined(__EMX__) || \ + defined(_WIN32) || defined(_Windows) || defined(__WINDOWS__) || \ + defined(__NT__) || defined(__CYGWIN__) #define HAVE_DOS_BASED_FILE_SYSTEM 1 #define HAVE_CASE_INSENSITIVE_FILE_SYSTEM 1 @@ -190,4 +191,3 @@ static inline char *FIND_LAST_DIRSEP (const char *_the_path) { #endif #endif /* FILENAMES_H */ -