From 8ae105ea923749d62c707160f87972182b00d42d Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Wed, 28 Nov 2007 01:29:19 +0000
Subject: * Merge ioq3-r1220

---
 src/qcommon/cvar.c       |  2 ++
 src/qcommon/net_ip.c     |  1 +
 src/qcommon/q_platform.h | 79 +++++++++++++++---------------------------------
 3 files changed, 28 insertions(+), 54 deletions(-)

(limited to 'src/qcommon')

diff --git a/src/qcommon/cvar.c b/src/qcommon/cvar.c
index 5503bcc1..f4f0b489 100644
--- a/src/qcommon/cvar.c
+++ b/src/qcommon/cvar.c
@@ -285,6 +285,8 @@ cvar_t *Cvar_Get( const char *var_name, const char *var_value, int flags ) {
 	cvar_vars = var;
 
 	var->flags = flags;
+	// note what types of cvars have been modified (userinfo, archive, serverinfo, systeminfo)
+	cvar_modifiedFlags |= var->flags;
 
 	hash = generateHashValue(var_name);
 	var->hashNext = hashTable[hash];
diff --git a/src/qcommon/net_ip.c b/src/qcommon/net_ip.c
index 258a6cba..abff7313 100644
--- a/src/qcommon/net_ip.c
+++ b/src/qcommon/net_ip.c
@@ -50,6 +50,7 @@ static qboolean	winsockInitialized = qfalse;
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/types.h>
+#include <sys/time.h>
 #include <unistd.h>
 
 #ifdef MACOS_X
diff --git a/src/qcommon/q_platform.h b/src/qcommon/q_platform.h
index 9d0d6dd3..e6f50eef 100644
--- a/src/qcommon/q_platform.h
+++ b/src/qcommon/q_platform.h
@@ -20,7 +20,7 @@ along with Tremulous; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
-//
+
 #ifndef __Q_PLATFORM_H
 #define __Q_PLATFORM_H
 
@@ -169,73 +169,28 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #endif
 
-//=============================================================== FreeBSD ===
+//=================================================================== BSD ===
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 
 #include <sys/types.h>
 #include <machine/endian.h>
 
+#if defined(__FreeBSD__)
 #define OS_STRING "freebsd"
-#define ID_INLINE inline
-#define PATH_SEP '/'
-
-#ifdef __i386__
-#define ARCH_STRING "x86"
-#elif defined __axp__
-#define ARCH_STRING "alpha"
-#endif
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define Q3_BIG_ENDIAN
-#else
-#define Q3_LITTLE_ENDIAN
-#endif
-
-#define DLL_EXT ".so"
-
-#endif
-
-//=============================================================== OpenBSD ===
-
-#ifdef __OpenBSD__
-
-#include <sys/types.h>
-#include <machine/endian.h>
-
+#elif defined(__OpenBSD__)
 #define OS_STRING "openbsd"
-#define ID_INLINE inline
-#define PATH_SEP '/'
-
-#ifdef __i386__
-#define ARCH_STRING "i386"
-#endif
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define Q3_BIG_ENDIAN
-#else
-#define Q3_LITTLE_ENDIAN
-#endif
-
-#define DLL_EXT ".so"
-
+#elif defined(__NetBSD__)
+#define OS_STRING "netbsd"
 #endif
 
-//================================================================ NetBSD ===
-
-// This is very much like the FreeBSD one and can probably be merged
-#ifdef __NetBSD__
-
-#include <sys/types.h>
-#include <machine/endian.h>
-
-#define OS_STRING "netbsd"
 #define ID_INLINE inline
 #define PATH_SEP '/'
 
 #ifdef __i386__
 #define ARCH_STRING "x86"
-// Netbsd has alot of platforms
+#elif defined __axp__
+#define ARCH_STRING "alpha"
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
@@ -275,6 +230,22 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #endif
 
+//================================================================== IRIX ===
+
+#ifdef __sgi
+
+#define OS_STRING "irix"
+#define ID_INLINE __inline
+#define PATH_SEP '/'
+
+#define ARCH_STRING "mips"
+
+#define Q3_BIG_ENDIAN // SGI's MIPS are always big endian
+
+#define DLL_EXT ".so"
+
+#endif
+
 //================================================================== Q3VM ===
 
 #ifdef Q3_VM
-- 
cgit