From 1c47b036011672721b3ec571d4544148be748511 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Sun, 17 Apr 2005 02:22:51 +0000
Subject: [PATCH] Urm. Compiles in FreeBSD with gmake and gcc. So, urm, yeah...
 Maybe it runs too.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@947 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/nqnet/nqnet.h        | 16 ----------------
 engine/qclib/initlib.c      |  2 +-
 engine/qclib/qcc_pr_lex.c   |  2 +-
 engine/server/q2game.h      |  1 -
 engine/server/sv_main.c     |  1 +
 engine/server/sv_sys_unix.c |  4 ----
 6 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/engine/nqnet/nqnet.h b/engine/nqnet/nqnet.h
index efd79be2d..da62c707c 100644
--- a/engine/nqnet/nqnet.h
+++ b/engine/nqnet/nqnet.h
@@ -242,22 +242,6 @@ typedef struct
 
 extern int hostCacheCount;
 extern hostcache_t hostcache[HOSTCACHESIZE];
-
-#if !defined(_WIN32 ) && !defined (__linux__) && !defined (__sun__)
-#ifndef htonl
-extern unsigned long htonl (unsigned long hostlong);
-#endif
-#ifndef htons
-extern unsigned short htons (unsigned short hostshort);
-#endif
-#ifndef ntohl
-extern unsigned long ntohl (unsigned long netlong);
-#endif
-#ifndef ntohs
-extern unsigned short ntohs (unsigned short netshort);
-#endif
-#endif
-
 #ifdef IDGODS
 qboolean IsID(struct qsockaddr *addr);
 #endif
diff --git a/engine/qclib/initlib.c b/engine/qclib/initlib.c
index 628b77eb2..1f51a63e4 100644
--- a/engine/qclib/initlib.c
+++ b/engine/qclib/initlib.c
@@ -1,6 +1,6 @@
 #define PROGSUSED
 #include "progsint.h"
-#include <malloc.h>
+#include <stdlib.h>
 
 typedef struct prmemb_s {
 	struct prmemb_s *prev;
diff --git a/engine/qclib/qcc_pr_lex.c b/engine/qclib/qcc_pr_lex.c
index d61cb5af8..19b20c0bb 100644
--- a/engine/qclib/qcc_pr_lex.c
+++ b/engine/qclib/qcc_pr_lex.c
@@ -526,7 +526,7 @@ pbool QCC_PR_Precompiler(void)
 		}
 		else if (!strncmp(directive, "include", 7))
 		{		
-			byte sm;
+			char sm;
 
 			pr_file_p=directive+7;
 
diff --git a/engine/server/q2game.h b/engine/server/q2game.h
index 8ed11a9e6..ee3d984d1 100644
--- a/engine/server/q2game.h
+++ b/engine/server/q2game.h
@@ -37,7 +37,6 @@ extern float	pm_stepheight;
 struct trace_s;
 struct q2trace_s;
 struct q2pmove_s;
-typedef struct q2pmove_s q2pmove_t;
 
 
 
diff --git a/engine/server/sv_main.c b/engine/server/sv_main.c
index 17f9cad0e..451fc08d6 100644
--- a/engine/server/sv_main.c
+++ b/engine/server/sv_main.c
@@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 #include "qwsvdef.h"
+#include "sys/types.h"
 #ifndef CLIENTONLY
 #define Q2EDICT_NUM(i) (q2edict_t*)((char *)ge->edicts+i*ge->edict_size)
 
diff --git a/engine/server/sv_sys_unix.c b/engine/server/sv_sys_unix.c
index b02aa0d47..a0ce6880d 100644
--- a/engine/server/sv_sys_unix.c
+++ b/engine/server/sv_sys_unix.c
@@ -26,15 +26,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <libc.h>
 #endif
 
-#if defined(__linux__) || defined(sun) || defined(__CYGWIN__)
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/time.h>
 #include <errno.h>
 #include <fcntl.h>
-#else
-#include <sys/dir.h>
-#endif
 
 cvar_t	sys_nostdout = {"sys_nostdout","0"};
 cvar_t	sys_extrasleep = {"sys_extrasleep","0"};