From 21a7ab44c7e54ad01ed205678fa418954609f826 Mon Sep 17 00:00:00 2001 From: jdolan Date: Sun, 7 Jul 2013 10:14:29 -0400 Subject: [PATCH] Re-define fileHandle_t as void * so that it is 64-bit safe. Fixes 4 compiler warnings and potentially some broken code. --- contrib/camera/misc.h | 2 +- libs/splines/q_shared.h | 5 +---- libs/splines/splines.h | 2 -- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/contrib/camera/misc.h b/contrib/camera/misc.h index 6dee0b2..8a53fce 100644 --- a/contrib/camera/misc.h +++ b/contrib/camera/misc.h @@ -31,7 +31,7 @@ const char* ExtractFilename( const char* path ); bool FileExists( const char *filename ); int Q_stricmp( const char *s1, const char *s2 ); -typedef int fileHandle_t; +typedef void * fileHandle_t; #define qfalse false #define qtrue true diff --git a/libs/splines/q_shared.h b/libs/splines/q_shared.h index d194615..9805fa8 100644 --- a/libs/splines/q_shared.h +++ b/libs/splines/q_shared.h @@ -212,10 +212,7 @@ typedef unsigned char byte; #define EQUAL_EPSILON 0.001 -typedef int qhandle_t; -typedef int sfxHandle_t; -typedef int fileHandle_t; -typedef int clipHandle_t; +typedef void * fileHandle_t; typedef enum { INVALID_JOINT = -1 diff --git a/libs/splines/splines.h b/libs/splines/splines.h index f55525b..6a395e7 100644 --- a/libs/splines/splines.h +++ b/libs/splines/splines.h @@ -35,8 +35,6 @@ #include "util_str.h" #include "math_vector.h" -typedef int fileHandle_t; - extern void glBox( idVec3 &color, idVec3 &point, float size ); extern void glLabeledPoint( idVec3 &color, idVec3 &point, float size, const char *label );