diff options
| author | dholland <dholland> | 2013-06-23 05:28:09 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2013-06-23 05:28:09 +0000 |
| commit | 3cee1c3e6d0a65de4f95f19ef377f8ee725bdbca (patch) | |
| tree | 0468e27c28bba29fa389cb00146037e729a5304d /games | |
| parent | 6ba3dfcbde21ca6f0dcd9c5e20c8b54d5b66cdef (diff) | |
| download | pkgsrc-3cee1c3e6d0a65de4f95f19ef377f8ee725bdbca.tar.gz | |
Fixing the clang build by breaking the gcc build is not on. Hi, Joerg.
Diffstat (limited to 'games')
| -rw-r--r-- | games/quakeforge/distinfo | 4 | ||||
| -rw-r--r-- | games/quakeforge/patches/patch-include_QF_mathlib.h | 23 |
2 files changed, 18 insertions, 9 deletions
diff --git a/games/quakeforge/distinfo b/games/quakeforge/distinfo index 9587d40d8ff..8a845301c13 100644 --- a/games/quakeforge/distinfo +++ b/games/quakeforge/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2013/03/28 21:25:52 joerg Exp $ +$NetBSD: distinfo,v 1.9 2013/06/23 05:28:09 dholland Exp $ SHA1 (quakeforge-0.5.5.tar.gz) = 3ceb229b3d777b6c5e0cb1530b4547b20737f402 RMD160 (quakeforge-0.5.5.tar.gz) = d22b29498e950bfdf96169bafee6409fca1a8e11 @@ -27,7 +27,7 @@ SHA1 (patch-au) = 5fbe311a03bc65e39e501b38f50a9c42b298a03a SHA1 (patch-av) = 8ba99fa13916ab9efd881a89760307fc5863e9d5 SHA1 (patch-aw) = d02d3a0cfbb47ad2f73e3ee523aed2964a8fcbae SHA1 (patch-include_QF_llist.h) = 34b69e99ca69d4564d7100b0e3bcd8d8a024ec94 -SHA1 (patch-include_QF_mathlib.h) = bb25e8798ff1339731e2fbb0f8e7c4ae7ba86e68 +SHA1 (patch-include_QF_mathlib.h) = 4ac3847ae96c053d42085a942fc9100858f81080 SHA1 (patch-include_r__dynamic.h) = e37cd1d4e242db48793c29c2b78aa78eb14d138d SHA1 (patch-include_r__local.h) = 7bb3b46ea3835489a20609739bd7a8dc79b36c96 SHA1 (patch-libs_util_llist.c) = d41fdac88ac1c9dbccd1bffd512f7e34ae381860 diff --git a/games/quakeforge/patches/patch-include_QF_mathlib.h b/games/quakeforge/patches/patch-include_QF_mathlib.h index dfe718e8f2b..a1c09a8b9b5 100644 --- a/games/quakeforge/patches/patch-include_QF_mathlib.h +++ b/games/quakeforge/patches/patch-include_QF_mathlib.h @@ -1,8 +1,8 @@ -$NetBSD: patch-include_QF_mathlib.h,v 1.1 2013/03/28 21:25:52 joerg Exp $ +$NetBSD: patch-include_QF_mathlib.h,v 1.2 2013/06/23 05:28:09 dholland Exp $ --- include/QF/mathlib.h.orig 2013-03-28 15:01:01.000000000 +0000 +++ include/QF/mathlib.h -@@ -255,11 +255,8 @@ void QuatMult (const quat_t v1, const qu +@@ -255,11 +255,12 @@ void QuatMult (const quat_t v1, const qu (PlaneDist (point, plane) - (plane)->dist) extern mplane_t * const frustum; @@ -10,26 +10,35 @@ $NetBSD: patch-include_QF_mathlib.h,v 1.1 2013/03/28 21:25:52 joerg Exp $ -extern inline qboolean R_CullSphere (const vec3_t origin, const float radius); -extern inline float VectorNormalize (vec3_t v); // returns vector length #ifndef IMPLEMENT_R_Cull --extern inline ++#if defined(__CLANG__) || !defined(__GNUC__) || defined(__GNC_STDC_INLINE__) +inline ++#else + extern inline ++#endif #endif qboolean R_CullBox (const vec3_t mins, const vec3_t maxs) -@@ -273,7 +270,7 @@ R_CullBox (const vec3_t mins, const vec3 +@@ -273,7 +274,11 @@ R_CullBox (const vec3_t mins, const vec3 } #ifndef IMPLEMENT_R_Cull --extern inline ++#if defined(__CLANG__) || !defined(__GNUC__) || defined(__GNC_STDC_INLINE__) +inline ++#else + extern inline ++#endif #endif qboolean R_CullSphere (const vec3_t origin, const float radius) -@@ -291,7 +288,7 @@ R_CullSphere (const vec3_t origin, const +@@ -291,7 +296,11 @@ R_CullSphere (const vec3_t origin, const } #ifndef IMPLEMENT_VectorNormalize --extern inline ++#if defined(__CLANG__) || !defined(__GNUC__) || defined(__GNC_STDC_INLINE__) +inline ++#else + extern inline ++#endif #endif float VectorNormalize (vec3_t v) |