From e8db66c2748a4374b3c3441e7fb2ec3186f1e43f Mon Sep 17 00:00:00 2001
From: Loring Holden <lsh@cs.brown.edu>
Date: Sun, 19 Mar 2000 17:01:35 +0000
Subject: [PATCH] pcx.c - string.h needed on some platforms vid_sunx.c,
 vid_sunxil.c - add context_x11.h, remove x_disp declaration

---
 common/pcx.c        | 4 ++++
 common/vid_sunx.c   | 4 ++--
 common/vid_sunxil.c | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/pcx.c b/common/pcx.c
index 7b8176e..1d08df6 100644
--- a/common/pcx.c
+++ b/common/pcx.c
@@ -37,6 +37,10 @@
 #include <quakefs.h>
 #include <sys.h>
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 /*
 	LoadPCX
 */
diff --git a/common/vid_sunx.c b/common/vid_sunx.c
index cf3a000..89df660 100644
--- a/common/vid_sunx.c
+++ b/common/vid_sunx.c
@@ -57,6 +57,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <sys.h>
 #include <client.h>
 #include <input.h>
+#include <context_x11.h>
 
 //cvar_t		_windowed_mouse = {"_windowed_mouse","0", CVAR_ARCHIVE};
 cvar_t	*_windowed_mouse;
@@ -70,7 +71,6 @@ static qboolean	mouse_in_window = false;
 static qboolean	mouse_grabbed = false; // we grab it when console is up
 
 /* Also in vid_x11.c - referenced by in_x11.c */
-Display		*x_disp = NULL;
 Window		x_win;
 
 typedef struct
@@ -941,7 +941,7 @@ static int config_notify=0;
 static int config_notify_width;
 static int config_notify_height;
 
-static void
+void
 GetEvent(void)
 {
 	XEvent x_event;
diff --git a/common/vid_sunxil.c b/common/vid_sunxil.c
index b5f5bfc..9ccf4d6 100644
--- a/common/vid_sunxil.c
+++ b/common/vid_sunxil.c
@@ -46,6 +46,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 #include "d_local.h"
+#include <context_x11.h>
 
 #define MIN_WIDTH 320
 #define MIN_HEIGHT 200
@@ -128,7 +129,6 @@ int		vid_buffersize;
 )
 
 qboolean			x_fullscreen = true;
-Display				*x_disp = NULL;
 int				x_screen, x_screen_width, x_screen_height;
 int				x_center_width, x_center_height;
 int				x_std_event_mask = STD_EVENT_MASK;