[openjk] 09/32: Fix build for OpenBSD (#912)

[Simon McVittie]

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

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

commit cf7e77c991209d7c2fb4f1e50e7814dc4fe7870e
Author: David CARLIER <devnexen at gmail.com>
Date:   Sun Mar 5 20:46:58 2017 +0000

    Fix build for OpenBSD (#912)
---
 CMakeLists.txt                | 4 ++++
 code/client/snd_music.cpp     | 2 +-
 code/qcommon/cm_test.cpp      | 2 +-
 code/rd-common/mdx_format.h   | 2 +-
 codemp/client/snd_music.cpp   | 2 +-
 codemp/rd-common/mdx_format.h | 2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e393e4b..f14230d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,6 +77,10 @@ if(APPLE)
   set(UseInternalJPEGDefault ON)
 endif()
 
+if(CMAKE_SYSTEM_NAME MATCHES "BSD")
+  add_definitions(-DIOAPI_NO_64)
+endif()
+
 option(UseInternalOpenAL "If set, use bundled OpenAL."  ${UseInternalOpenALDefault})
 option(UseInternalZlib   "If set, use bundled zlib."    ${UseInternalZlibDefault})
 option(UseInternalPNG    "If set, use bundled libpng."  ${UseInternalPNGDefault})
diff --git a/code/client/snd_music.cpp b/code/client/snd_music.cpp
index 1d9596d..dcd10a6 100644
--- a/code/client/snd_music.cpp
+++ b/code/client/snd_music.cpp
@@ -75,7 +75,7 @@ struct MusicExitTime_t	// need to declare this way for operator < below
 
 	// I'm defining this '<' operator so STL's sort algorithm will work
 	//
-	bool operator < (const MusicExitTime_t& _X) const {return (fTime < _X.fTime);}
+	bool operator < (const MusicExitTime_t& X) const {return (fTime < X.fTime);}
 };
 
 // it's possible for all 3 of these to be empty if it's boss or death music
diff --git a/code/qcommon/cm_test.cpp b/code/qcommon/cm_test.cpp
index 0fe382f..77a2265 100644
--- a/code/qcommon/cm_test.cpp
+++ b/code/qcommon/cm_test.cpp
@@ -33,7 +33,7 @@ public:
 		z(_z)
 	{
 	}
-	bool operator== (const CPoint& _P) const {return((x==_P.x)&&(y==_P.y)&&(z==_P.z));}
+	bool operator== (const CPoint& P) const {return((x==P.x)&&(y==P.y)&&(z==P.z));}
 };
 /*
 class CPointComparator
diff --git a/code/rd-common/mdx_format.h b/code/rd-common/mdx_format.h
index b2d92b1..c205c61 100644
--- a/code/rd-common/mdx_format.h
+++ b/code/rd-common/mdx_format.h
@@ -148,7 +148,7 @@ typedef struct
 	// I'm defining this '<' operator so this struct can be used as an STL <map> key...
 	//
 	#ifdef __cplusplus
-	bool operator < (const mdxaCompQuatBone_t& _X) const {return (memcmp(Comp,_X.Comp,sizeof(Comp))<0);}
+	bool operator < (const mdxaCompQuatBone_t& X) const {return (memcmp(Comp,X.Comp,sizeof(Comp))<0);}
 	#endif
 }
 #ifndef __cplusplus
diff --git a/codemp/client/snd_music.cpp b/codemp/client/snd_music.cpp
index 686209c..4991904 100644
--- a/codemp/client/snd_music.cpp
+++ b/codemp/client/snd_music.cpp
@@ -74,7 +74,7 @@ struct MusicExitTime_t	// need to declare this way for operator < below
 
 	// I'm defining this '<' operator so STL's sort algorithm will work
 	//
-	bool operator < (const MusicExitTime_t& _X) const {return (fTime < _X.fTime);}
+	bool operator < (const MusicExitTime_t& X) const {return (fTime < X.fTime);}
 };
 
 // it's possible for all 3 of these to be empty if it's boss or death music
diff --git a/codemp/rd-common/mdx_format.h b/codemp/rd-common/mdx_format.h
index 13cf022..c097a22 100644
--- a/codemp/rd-common/mdx_format.h
+++ b/codemp/rd-common/mdx_format.h
@@ -148,7 +148,7 @@ typedef struct
 	// I'm defining this '<' operator so this struct can be used as an STL <map> key...
 	//
 	#ifdef __cplusplus
-	bool operator < (const mdxaCompQuatBone_t& _X) const {return (memcmp(Comp,_X.Comp,sizeof(Comp))<0);}
+	bool operator < (const mdxaCompQuatBone_t& X) const {return (memcmp(Comp,X.Comp,sizeof(Comp))<0);}
 	#endif
 }
 #ifndef __cplusplus

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