From f29ea7f1d3f782743eccef390d5e0bc36e4994e2 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 30 Dec 2000 03:07:15 +0000
Subject: [PATCH] fix up <> vs "" in #includes

---
 include/mdfour.h       |  4 +---
 include/qargs.h        |  2 +-
 include/quakeio.h      |  2 +-
 include/ver_check.h    |  2 +-
 source/cd_linux.c      |  4 ++--
 source/cd_sdl.c        |  4 ++--
 source/cl_main.c       | 27 +++++++++++++++------------
 source/net_packetlog.c |  2 +-
 8 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/include/mdfour.h b/include/mdfour.h
index b1b228b..bbe09c4 100644
--- a/include/mdfour.h
+++ b/include/mdfour.h
@@ -30,9 +30,7 @@
 #ifndef _MDFOUR_H
 #define _MDFOUR_H
 
-#ifndef _UINT32_H
-#include	<uint32.h>
-#endif
+#include	"uint32.h"
 
 struct mdfour {
 	uint32 A, B, C, D;
diff --git a/include/qargs.h b/include/qargs.h
index a916a01..f709108 100644
--- a/include/qargs.h
+++ b/include/qargs.h
@@ -31,7 +31,7 @@
 #ifndef _QARGS_H
 #define _QARGS_H
 
-#include <qtypes.h>
+#include "qtypes.h"
 
 extern	int		com_argc;
 extern	char	**com_argv;
diff --git a/include/quakeio.h b/include/quakeio.h
index d43d822..86b2108 100644
--- a/include/quakeio.h
+++ b/include/quakeio.h
@@ -31,7 +31,7 @@
 #define _QUAKEIO_H
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
 #include <stdio.h>
diff --git a/include/ver_check.h b/include/ver_check.h
index a169802..385defd 100644
--- a/include/ver_check.h
+++ b/include/ver_check.h
@@ -30,7 +30,7 @@
 #define __ver_check_h_
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
 /*
diff --git a/source/cd_linux.c b/source/cd_linux.c
index 4890513..6ae0b39 100644
--- a/source/cd_linux.c
+++ b/source/cd_linux.c
@@ -32,10 +32,10 @@
 
 #include <fcntl.h>
 #ifdef HAVE_STRING_H
-#include "string.h"
+#include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
-#include "strings.h"
+#include <strings.h>
 #endif
 #include <errno.h>
 #ifdef HAVE_SYS_IOCTL_H
diff --git a/source/cd_sdl.c b/source/cd_sdl.c
index 57787fa..5906a46 100644
--- a/source/cd_sdl.c
+++ b/source/cd_sdl.c
@@ -33,10 +33,10 @@
 # include <windows.h>
 #endif
 #ifdef HAVE_STRING_H
-#include "string.h"
+#include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
-#include "strings.h"
+#include <strings.h>
 #endif
 
 #include <SDL.h>
diff --git a/source/cl_main.c b/source/cl_main.c
index d557d92..be3cb09 100644
--- a/source/cl_main.c
+++ b/source/cl_main.c
@@ -30,7 +30,17 @@
 # include "config.h"
 #endif
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 #include <ctype.h>
+#include <netinet/in.h>
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
 
 #include "bothdefs.h"
 #include "buildnum.h"
@@ -42,6 +52,7 @@
 #include "cl_main.h"
 #include "cl_parse.h"
 #include "cl_pred.h"
+#include "cl_slist.h"
 #include "cl_tent.h"
 #include "client.h"
 #include "cmd.h"
@@ -49,6 +60,9 @@
 #include "cvar.h"
 #include "draw.h"
 #include "host.h"
+#ifdef _WIN32
+#include "in_win.h"
+#endif
 #include "input.h"
 #include "keys.h"
 #include "menu.h"
@@ -68,29 +82,18 @@
 #include "vid.h"
 #include "view.h"
 #include "va.h"
+#include "winquake.h"
 
 #ifdef __sun
 /* Sun's model_t in sys/model.h conflicts w/ Quake's model_t */
 #define model_t sunmodel_t
 #endif
 
-#ifdef _WIN32
-#include "winquake.h"
-#include "winsock.h"
-#include "in_win.h"
-#else
-#include <netinet/in.h>
-#endif
 
 #ifdef __sun
 #undef model_t
 #endif
 
-#include <cl_slist.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-
 void        CL_RemoveQFInfoKeys ();
 
 // we need to declare some mouse variables here, because the menu system
diff --git a/source/net_packetlog.c b/source/net_packetlog.c
index dcebfc9..b7ca77e 100644
--- a/source/net_packetlog.c
+++ b/source/net_packetlog.c
@@ -30,7 +30,7 @@
 #define QUAKEWORLD
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
 #include <ctype.h>