[openarena] 01/13: Remove unnecessary definition of idx64 from ARCH_STRING patch

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openarena.

commit 96694ae1ceed688f47c3253d6de01c6bd192824d
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jun 24 23:40:55 2017 +0100

    Remove unnecessary definition of idx64 from ARCH_STRING patch
---
 ...efine-ARCH_STRING-in-Makefile-on-Linux-and-other-G.patch | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/debian/patches/build-define-ARCH_STRING-in-Makefile-on-Linux-and-other-G.patch b/debian/patches/build-define-ARCH_STRING-in-Makefile-on-Linux-and-other-G.patch
index 1ed6639..d62436c 100644
--- a/debian/patches/build-define-ARCH_STRING-in-Makefile-on-Linux-and-other-G.patch
+++ b/debian/patches/build-define-ARCH_STRING-in-Makefile-on-Linux-and-other-G.patch
@@ -34,8 +34,8 @@ COMPILE_PLATFORM.
 (cherry-picked from ioquake3 commit 2a71948f21fe588dbce9b29409283e9c912ef8e7)
 ---
  Makefile                  |  6 +++++-
- code/qcommon/q_platform.h | 35 +++++++----------------------------
- 2 files changed, 12 insertions(+), 29 deletions(-)
+ code/qcommon/q_platform.h | 30 ++----------------------------
+ 2 files changed, 7 insertions(+), 29 deletions(-)
 
 diff --git a/Makefile b/Makefile
 index 11a9efc..6eeba4f 100644
@@ -62,10 +62,10 @@ index 11a9efc..6eeba4f 100644
    ifeq ($(USE_OPENAL),1)
      BASE_CFLAGS += -DUSE_OPENAL
 diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
-index cfa44b7..df5a356 100644
+index cfa44b7..fc8d40d 100644
 --- a/code/qcommon/q_platform.h
 +++ b/code/qcommon/q_platform.h
-@@ -162,34 +162,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+@@ -162,34 +162,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  #define ID_INLINE inline
  #define PATH_SEP '/'
  
@@ -99,11 +99,6 @@ index cfa44b7..df5a356 100644
 -#define ARCH_STRING "sh"
 +#if !defined(ARCH_STRING)
 +# error ARCH_STRING should be defined by the Makefile
-+#endif
-+
-+#if defined __x86_64__
-+#undef idx64
-+#define idx64 1
  #endif
  
  #if __FLOAT_WORD_ORDER == __BIG_ENDIAN

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openarena.git