aboutsummaryrefslogtreecommitdiff
path: root/games/iortcw/files/patch-MP_code_qcommon_q__platform.h
diff options
context:
space:
mode:
Diffstat (limited to 'games/iortcw/files/patch-MP_code_qcommon_q__platform.h')
-rw-r--r--games/iortcw/files/patch-MP_code_qcommon_q__platform.h42
1 files changed, 16 insertions, 26 deletions
diff --git a/games/iortcw/files/patch-MP_code_qcommon_q__platform.h b/games/iortcw/files/patch-MP_code_qcommon_q__platform.h
index 770e384a9750..1e6322c627c0 100644
--- a/games/iortcw/files/patch-MP_code_qcommon_q__platform.h
+++ b/games/iortcw/files/patch-MP_code_qcommon_q__platform.h
@@ -1,32 +1,22 @@
--- MP/code/qcommon/q_platform.h.orig 2019-03-16 18:09:48 UTC
+++ MP/code/qcommon/q_platform.h
-@@ -35,11 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+@@ -221,14 +221,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ #define ID_INLINE inline
+ #define PATH_SEP '/'
- #else
-
--#if (defined _M_IX86 || defined __i386__) && !defined(C_ONLY)
--#define id386 1
--#else
- #define id386 0
--#endif
-
- #if (defined(powerc) || defined(powerpc) || defined(ppc) || \
- defined(__ppc) || defined(__ppc__)) && !defined(C_ONLY)
-@@ -224,11 +220,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- #ifdef __i386__
- #define ARCH_STRING "i386"
- #elif defined __amd64__
--#undef idx64
--#define idx64 1
- #define ARCH_STRING "amd64"
- #elif defined __axp__
- #define ARCH_STRING "alpha"
-+#elif defined __powerpc64__
-+#define ARCH_STRING "powerpc64"
-+#elif defined __powerpc__
-+#define ARCH_STRING "powerpc"
-+#elif defined __riscv
-+#define ARCH_STRING "riscv64"
+-#ifdef __i386__
+-#define ARCH_STRING "i386"
+-#elif defined __amd64__
++#if !defined(ARCH_STRING)
++# error ARCH_STRING should be defined by the Makefile
++#endif
++
++#if defined __x86_64__
+ #undef idx64
+ #define idx64 1
+-#define ARCH_STRING "amd64"
+-#elif defined __axp__
+-#define ARCH_STRING "alpha"
#endif
#if BYTE_ORDER == BIG_ENDIAN