Magellan Linux

Annotation of /trunk/xorg-server/patches/xorg-server-1.2.0-remove__GLinterface.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 239 - (hide annotations) (download)
Sun Jul 1 02:40:10 2007 UTC (16 years, 11 months ago) by niro
File size: 1513 byte(s)
-fixes compilation with mesa-7.0

1 niro 239 diff -Nur GL.orig/glx/glxext.c GL/glx/glxext.c
2     --- GL.orig/glx/glxext.c 2006-12-01 03:40:10.000000000 +0200
3     +++ GL/glx/glxext.c 2007-04-23 01:23:39.900111785 +0300
4     @@ -275,7 +275,7 @@
5     /*
6     ** The GL was will call this routine if an error occurs.
7     */
8     -void __glXErrorCallBack(__GLinterface *gc, GLenum code)
9     +void __glXErrorCallBack(GLenum code)
10     {
11     errorOccured = GL_TRUE;
12     }
13     diff -Nur GL.orig/glx/glxext.h GL/glx/glxext.h
14     --- GL.orig/glx/glxext.h 2006-09-18 09:04:17.000000000 +0300
15     +++ GL/glx/glxext.h 2007-04-23 01:23:39.900111785 +0300
16     @@ -66,7 +66,7 @@
17     extern GLboolean __glXFreeContext(__GLXcontext *glxc);
18     extern void __glXFlushContextCache(void);
19    
20     -extern void __glXErrorCallBack(__GLinterface *gc, GLenum code);
21     +extern void __glXErrorCallBack(GLenum code);
22     extern void __glXClearErrorOccured(void);
23     extern GLboolean __glXErrorOccured(void);
24     extern void __glXResetLargeCommandStatus(__GLXclientState*);
25     diff -Nur hw.orig/dmx/glxProxy/glxext.h hw/dmx/glxProxy/glxext.h
26     --- hw.orig/dmx/glxProxy/glxext.h 2006-09-18 09:04:17.000000000 +0300
27     +++ hw/dmx/glxProxy/glxext.h 2006-09-18 09:04:17.000000000 +0300
28     @@ -67,7 +67,7 @@
29    
30     extern void __glXNoSuchRenderOpcode(GLbyte*);
31     extern int __glXNoSuchSingleOpcode(__GLXclientState*, GLbyte*);
32     -extern void __glXErrorCallBack(__GLinterface *gc, GLenum code);
33     +extern void __glXErrorCallBack(GLenum code);
34     extern void __glXClearErrorOccured(void);
35     extern GLboolean __glXErrorOccured(void);
36     extern void __glXResetLargeCommandStatus(__GLXclientState*);