4c345ed272
- Use Makefile for building instead of scons, and remove Perl dependency. - Use pkg-plist. - Add OPTIONS. Allow to build without X11, threaded version, etc. - Fix building on non-i386 and FreeBSD 4.X. - Respect CFLAGS when optimizations are enabled. - Add patch to fix 2 security vulnerabilities [1]. PR: ports/98295 Submitted by: alepulver (myself) Approved by: maintainer (timeout) Obtained from: q3icculus (http://icculus.org/quake3/) [1] Security: CVE-2006-2082 [1]
140 lines
3.3 KiB
C
140 lines
3.3 KiB
C
--- ./code/game/q_shared.h.orig Wed May 31 20:52:06 2006
|
|
+++ ./code/game/q_shared.h Wed May 31 20:54:33 2006
|
|
@@ -126,12 +126,14 @@
|
|
|
|
#define ID_INLINE __inline
|
|
|
|
+#if 0
|
|
static ID_INLINE short BigShort( short l) { return ShortSwap(l); }
|
|
#define LittleShort
|
|
static ID_INLINE int BigLong(int l) { LongSwap(l); }
|
|
#define LittleLong
|
|
static ID_INLINE float BigFloat(const float *l) { FloatSwap(l); }
|
|
#define LittleFloat
|
|
+#endif
|
|
|
|
#define PATH_SEP '\\'
|
|
|
|
@@ -182,12 +184,14 @@
|
|
return fi;
|
|
}
|
|
|
|
+#if 0
|
|
#define BigShort
|
|
static inline short LittleShort(short l) { return ShortSwap(l); }
|
|
#define BigLong
|
|
static inline int LittleLong (int l) { return LongSwap(l); }
|
|
#define BigFloat
|
|
static inline float LittleFloat (const float l) { return FloatSwap(&l); }
|
|
+#endif
|
|
|
|
#endif
|
|
|
|
@@ -205,12 +209,14 @@
|
|
|
|
void Sys_PumpEvents( void );
|
|
|
|
+#if 0
|
|
#define BigShort
|
|
static inline short LittleShort(short l) { return ShortSwap(l); }
|
|
#define BigLong
|
|
static inline int LittleLong (int l) { return LongSwap(l); }
|
|
#define BigFloat
|
|
static inline float LittleFloat (const float l) { return FloatSwap(&l); }
|
|
+#endif
|
|
|
|
#endif
|
|
|
|
@@ -244,6 +250,7 @@
|
|
#define BOTLIB_HARD_LINKED
|
|
#endif
|
|
|
|
+#if 0
|
|
#if !idppc
|
|
inline static short BigShort( short l) { return ShortSwap(l); }
|
|
#define LittleShort
|
|
@@ -259,6 +266,7 @@
|
|
#define BigFloat
|
|
inline static float LittleFloat (const float *l) { return FloatSwap(l); }
|
|
#endif
|
|
+#endif
|
|
|
|
#endif
|
|
|
|
@@ -280,8 +288,16 @@
|
|
|
|
#define PATH_SEP '/'
|
|
|
|
+#include <machine/param.h>
|
|
+#if __FreeBSD_version < 500000
|
|
+#include <inttypes.h>
|
|
+#else
|
|
+#include <stdint.h>
|
|
+#endif
|
|
+
|
|
// bk010116 - omitted Q3STATIC (see Linux above), broken target
|
|
|
|
+#if 0
|
|
#if !idppc
|
|
static short BigShort( short l) { return ShortSwap(l); }
|
|
#define LittleShort
|
|
@@ -297,6 +313,7 @@
|
|
#define BigFloat
|
|
static float LittleFloat (const float *l) { return FloatSwap(l); }
|
|
#endif
|
|
+#endif
|
|
|
|
#endif
|
|
|
|
@@ -428,13 +445,9 @@
|
|
void *Hunk_Alloc( int size, ha_pref preference );
|
|
#endif
|
|
|
|
-#ifdef __linux__
|
|
// https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=371
|
|
// custom Snd_Memset implementation for glibc memset bug workaround
|
|
void Snd_Memset (void* dest, const int val, const size_t count);
|
|
-#else
|
|
-#define Snd_Memset Com_Memset
|
|
-#endif
|
|
|
|
#if !( defined __VECTORC )
|
|
void Com_Memset (void* dest, const int val, const size_t count);
|
|
@@ -763,7 +776,7 @@
|
|
float Com_Clamp( float min, float max, float value );
|
|
|
|
char *COM_SkipPath( char *pathname );
|
|
-void COM_StripExtension( const char *in, char *out );
|
|
+void COM_StripExtension( const char *in, char *out, int destsize );
|
|
void COM_DefaultExtension( char *path, int maxSize, const char *extension );
|
|
|
|
void COM_BeginParseSession( const char *name );
|
|
@@ -864,18 +877,18 @@
|
|
} qint64;
|
|
|
|
//=============================================
|
|
-/*
|
|
-short BigShort(short l);
|
|
-short LittleShort(short l);
|
|
-int BigLong (int l);
|
|
-int LittleLong (int l);
|
|
-qint64 BigLong64 (qint64 l);
|
|
-qint64 LittleLong64 (qint64 l);
|
|
-float BigFloat (const float *l);
|
|
-float LittleFloat (const float *l);
|
|
+
|
|
+int16_t BigShort(int16_t l);
|
|
+int16_t LittleShort(int16_t l);
|
|
+int32_t BigLong (int32_t l);
|
|
+int32_t LittleLong (int32_t l);
|
|
+qint64 BigLong64 (qint64 l);
|
|
+qint64 LittleLong64 (qint64 l);
|
|
+float BigFloat (float l);
|
|
+float LittleFloat (float l);
|
|
|
|
void Swap_Init (void);
|
|
-*/
|
|
+
|
|
char * QDECL va(char *format, ...);
|
|
|
|
//=============================================
|