Attachment 2777 Details for Bug 3407 – kill-latent-r5isms-1.patch

[patch] kill-latent-r5isms-1.patch

kill-latent-r5isms-1.patch (text/plain), 3.73 KB, created by Adam Jackson on 2005-05-26 14:05:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Jackson

Created: 2005-05-26 14:05:54 UTC

Size: 3.73 KB

patch

obsolete

> lib/XTrap/XEWrappers.c                    |    4 ----
> programs/Xserver/GL/glx/glxext.c          |    6 ------
> programs/Xserver/GL/glx/glxscreens.c      |    4 ----
> programs/Xserver/hw/dmx/glxProxy/glxext.c |    8 --------
> 4 files changed, 22 deletions(-)
>
>Index: lib/XTrap/XEWrappers.c
>===================================================================
>RCS file: /cvs/xorg/xc/lib/XTrap/XEWrappers.c,v
>retrieving revision 1.2
>diff -u -d -r1.2 XEWrappers.c
>--- lib/XTrap/XEWrappers.c	23 Apr 2004 18:43:36 -0000	1.2
>+++ lib/XTrap/XEWrappers.c	26 May 2005 21:01:08 -0000
>@@ -264,15 +264,11 @@
> int XETrapWaitForSomething(XtAppContext app)
> {
> #ifndef vms
>-#ifndef X11R5
>     return(_XtWaitForSomething(app, FALSE, FALSE, FALSE, FALSE, TRUE
> #ifdef XTHREADS
>     , FALSE
> #endif /* XTHREADS */
>     , 0L));
>-#else /* X11R5 */
>-    return(_XtwaitForSomething(FALSE, FALSE, FALSE, TRUE, 0L, app));
>-#endif /* X11R5 */
> #else   /* vms */
> #define IS_AFTER(t1,t2) (((t2).high > (t1).high) \
>        ||(((t2).high == (t1).high)&& ((t2).low > (t1).low)))
>Index: programs/Xserver/GL/glx/glxext.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/GL/glx/glxext.c,v
>retrieving revision 1.3
>diff -u -d -r1.3 glxext.c
>--- programs/Xserver/GL/glx/glxext.c	26 Jul 2004 19:06:04 -0000	1.3
>+++ programs/Xserver/GL/glx/glxext.c	26 May 2005 21:01:09 -0000
>@@ -221,15 +221,9 @@
>     ExtensionEntry *extEntry;
>     int i;
>     
>-#ifdef X11R5
>-    __glXContextRes = CreateNewResourceType(ContextGone);
>-    __glXClientRes = CreateNewResourceType(ClientGone);
>-    __glXPixmapRes = CreateNewResourceType(PixmapGone);
>-#else
>     __glXContextRes = CreateNewResourceType((DeleteType)ContextGone);
>     __glXClientRes = CreateNewResourceType((DeleteType)ClientGone);
>     __glXPixmapRes = CreateNewResourceType((DeleteType)PixmapGone);
>-#endif 
> 
>     /*
>     ** Add extension to server extensions.
>Index: programs/Xserver/GL/glx/glxscreens.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/GL/glx/glxscreens.c,v
>retrieving revision 1.4
>diff -u -d -r1.4 glxscreens.c
>--- programs/Xserver/GL/glx/glxscreens.c	26 Jul 2004 19:06:04 -0000	1.4
>+++ programs/Xserver/GL/glx/glxscreens.c	26 May 2005 21:01:09 -0000
>@@ -298,11 +298,7 @@
> 		__glXActiveScreens[i].GLXversion = __glXStrdup(GLXServerVersion);
> 		__glXActiveScreens[i].GLXextensions = __glXStrdup(GLXServerExtensions);
> 
>-#ifdef X11R5
>-		__glXDrawableRes = CreateNewResourceType(DrawableGone);
>-#else
> 		__glXDrawableRes = CreateNewResourceType((DeleteType)DrawableGone);
>-#endif
> 		wrapPositionWindow(i);
> 	    }
> 	}
>Index: programs/Xserver/hw/dmx/glxProxy/glxext.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/dmx/glxProxy/glxext.c,v
>retrieving revision 1.1
>diff -u -d -r1.1 glxext.c
>--- programs/Xserver/hw/dmx/glxProxy/glxext.c	30 Jun 2004 20:06:55 -0000	1.1
>+++ programs/Xserver/hw/dmx/glxProxy/glxext.c	26 May 2005 21:01:09 -0000
>@@ -273,19 +273,11 @@
>        return;
>     }
>     
>-#ifdef X11R5
>-    __glXContextRes = CreateNewResourceType(ContextGone);
>-    __glXClientRes = CreateNewResourceType(ClientGone);
>-    __glXPixmapRes = CreateNewResourceType(PixmapGone);
>-    __glXWindowRes = CreateNewResourceType(WindowGone);
>-    __glXPbufferRes = CreateNewResourceType(PbufferGone);
>-#else
>     __glXContextRes = CreateNewResourceType((DeleteType)ContextGone);
>     __glXClientRes = CreateNewResourceType((DeleteType)ClientGone);
>     __glXPixmapRes = CreateNewResourceType((DeleteType)PixmapGone);
>     __glXWindowRes = CreateNewResourceType((DeleteType)WindowGone);
>     __glXPbufferRes = CreateNewResourceType((DeleteType)PbufferGone);
>-#endif 
> 
>     /*
>     ** Add extension to server extensions.

Actions: View | Splinter Review

Attachments on bug 3407: 2777

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.