From c8ab8011283ab742de34da906ea9e0f44058194e Mon Sep 17 00:00:00 2001
From: Thad Ward <coderjoe@grnet.com>
Date: Thu, 25 Jan 2001 21:16:43 +0000
Subject: [PATCH] qw_client.dsp and makefile.mgw:     remove vid_win.c from the
 projects. no longer needed after taniwha's     cl_main changes.

cl_main.c:
    remove #include "winquake.h", which is not needed

vc/config.h:
    add #define HAVE_WINSOCK_H
---
 include/win32/vc/config.h | 3 +++
 source/cl_main.c          | 1 -
 source/makefile.mgw       | 2 +-
 source/qw_client.dsp      | 4 ----
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/include/win32/vc/config.h b/include/win32/vc/config.h
index 27f48be..f0f90ea 100644
--- a/include/win32/vc/config.h
+++ b/include/win32/vc/config.h
@@ -269,6 +269,9 @@
 /* Define if you have a sane fnmatch.h   */
 #define HAVE_FNMATCH_PROTO
 
+/* Define if you have winsock.h in your includes path */
+#define HAVE_WINSOCK_H
+
 /* Define this to something appropriate for declaring 0 length arrays */
 #define ZERO_LENGTH_ARRAY 0
 
diff --git a/source/cl_main.c b/source/cl_main.c
index c48c9da..d9d547a 100644
--- a/source/cl_main.c
+++ b/source/cl_main.c
@@ -86,7 +86,6 @@
 #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 */
diff --git a/source/makefile.mgw b/source/makefile.mgw
index c667bb7..6375d41 100644
--- a/source/makefile.mgw
+++ b/source/makefile.mgw
@@ -82,7 +82,7 @@ WIN32_OTHER = cd_win.c joy_win.c in_win.c
 client_SOURCES= cl_cam.c cl_cmd.c cl_cvar.c cl_demo.c cl_ents.c cl_input.c \
 	cl_main.c cl_misc.c cl_parse.c cl_pred.c cl_slist.c cl_tent.c \
 	console.c keys.c menu.c model_alias.c model_sprite.c nonintel.c \
-	pcx.c r_view.c sbar.c skin.c teamplay.c tga.c wad.c vid.c vid_win.c $(client_ASM)
+	pcx.c r_view.c sbar.c skin.c teamplay.c tga.c wad.c vid.c $(client_ASM)
 
 #
 # OPENGL rendering
diff --git a/source/qw_client.dsp b/source/qw_client.dsp
index 34229ea..341bf62 100644
--- a/source/qw_client.dsp
+++ b/source/qw_client.dsp
@@ -1481,10 +1481,6 @@ SOURCE=.\vid_wgl.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\vid_win.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\wad.c
 # End Source File
 # Begin Source File