]> de.git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
fix compile errors in vid_glx.c
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 23 Oct 2011 19:08:42 +0000 (19:08 +0000)
committerdivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 23 Oct 2011 19:08:42 +0000 (19:08 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11465 d7cf8633-e32d-0410-b094-e92efae38249

vid_glx.c

index 46e0280101e9a6071b37aeb930f3a9c83354c060..4456287800f887889d3860e47d750be2245dbcad 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -142,7 +142,7 @@ static Colormap vidx11_colormap;
 //
 
 long keysym2ucs(KeySym keysym);
-void DP_Xutf8LookupString(XKeyEvent * ev,
+static void DP_Xutf8LookupString(XKeyEvent * ev,
                         Uchar *uch,
                         KeySym * keysym_return,
                         Status * status_return)
@@ -871,14 +871,14 @@ void VID_Shutdown(void)
        Key_ClearStates ();
 }
 
-void signal_handler(int sig)
+static void signal_handler(int sig)
 {
        Con_Printf("Received signal %d, exiting...\n", sig);
        VID_RestoreSystemGamma();
        Sys_Quit(1);
 }
 
-void InitSig(void)
+static void InitSig(void)
 {
        signal(SIGHUP, signal_handler);
        signal(SIGINT, signal_handler);
@@ -977,7 +977,7 @@ void VID_Init(void)
        vidx11_shminfo[1].shmid = -1;
 }
 
-void VID_BuildGLXAttrib(int *attrib, qboolean stencil, qboolean stereobuffer, int samples)
+static void VID_BuildGLXAttrib(int *attrib, qboolean stencil, qboolean stereobuffer, int samples)
 {
        *attrib++ = GLX_RGBA;
        *attrib++ = GLX_RED_SIZE;*attrib++ = stencil ? 8 : 5;
@@ -1003,7 +1003,7 @@ void VID_BuildGLXAttrib(int *attrib, qboolean stencil, qboolean stereobuffer, in
        *attrib++ = None;
 }
 
-qboolean VID_InitModeSoft(viddef_mode_t *mode)
+static qboolean VID_InitModeSoft(viddef_mode_t *mode)
 {
        int i, j;
        XSetWindowAttributes attr;
@@ -1017,6 +1017,7 @@ qboolean VID_InitModeSoft(viddef_mode_t *mode)
        unsigned char *data;
        XGCValues gcval;
        const char *dpyname;
+       char vabuf[1024];
 
        vid_isfullscreen = false;
        vid_isnetwmfullscreen = false;
@@ -1315,6 +1316,7 @@ qboolean VID_InitModeGL(viddef_mode_t *mode)
        char *xpm;
        char **idata;
        unsigned char *data;
+       char vabuf[1024];
 
        vid_isfullscreen = false;
        vid_isnetwmfullscreen = false;