From c1b3b6f0bebc317deca467a7a3c97d27c17c1f5e Mon Sep 17 00:00:00 2001 From: Thilo Schulz Date: Fri, 5 Aug 2011 12:11:27 +0000 Subject: [PATCH] Fix compilation on non-x86 platforms, by Simon McVittie --- code/qcommon/q_platform.h | 2 ++ code/qcommon/q_shared.h | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h index 14a5c7cd..8bc2984c 100644 --- a/code/qcommon/q_platform.h +++ b/code/qcommon/q_platform.h @@ -348,6 +348,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA //endianness +void CopyShortSwap (void *dest, void *src); +void CopyLongSwap (void *dest, void *src); short ShortSwap (short l); int LongSwap (int l); float FloatSwap (const float *f); diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h index 07b92455..8257bee6 100644 --- a/code/qcommon/q_shared.h +++ b/code/qcommon/q_shared.h @@ -443,7 +443,9 @@ int Q_isnan(float x); extern int (QDECL *Q_VMftol)(void); extern void (QDECL *Q_SnapVector)(vec3_t vec); #else - #define Q_ftol(f) lrintf((f)) + // Q_ftol must expand to a function name so the pluggable renderer can take + // its address + #define Q_ftol lrintf #define Q_SnapVector(vec)\ do\ {\