pcx.c - string.h needed on some platforms

vid_sunx.c, vid_sunxil.c - add context_x11.h, remove x_disp declaration
This commit is contained in:
Loring Holden 2000-03-19 17:01:35 +00:00
parent 674ddcffe5
commit e8db66c274
3 changed files with 7 additions and 3 deletions

View file

@ -37,6 +37,10 @@
#include <quakefs.h>
#include <sys.h>
#ifdef HAVE_STRING_H
#include <string.h>
#endif
/*
LoadPCX
*/

View file

@ -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;

View file

@ -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;