diff options
| -rw-r--r-- | GL/glx/glxext.c | 6 | ||||
| -rw-r--r-- | GL/glx/glxscreens.c | 4 | ||||
| -rw-r--r-- | hw/dmx/glxProxy/glxext.c | 8 |
3 files changed, 0 insertions, 18 deletions
diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c index 87c9e1448..c86540fa4 100644 --- a/GL/glx/glxext.c +++ b/GL/glx/glxext.c @@ -221,15 +221,9 @@ void GlxExtensionInit(void) 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. diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c index 6ddbfcbd0..3ffefa36a 100644 --- a/GL/glx/glxscreens.c +++ b/GL/glx/glxscreens.c @@ -298,11 +298,7 @@ void __glXScreenInit(GLint numscreens) __glXActiveScreens[i].GLXversion = __glXStrdup(GLXServerVersion); __glXActiveScreens[i].GLXextensions = __glXStrdup(GLXServerExtensions); -#ifdef X11R5 - __glXDrawableRes = CreateNewResourceType(DrawableGone); -#else __glXDrawableRes = CreateNewResourceType((DeleteType)DrawableGone); -#endif wrapPositionWindow(i); } } diff --git a/hw/dmx/glxProxy/glxext.c b/hw/dmx/glxProxy/glxext.c index e500351f8..554739ef9 100644 --- a/hw/dmx/glxProxy/glxext.c +++ b/hw/dmx/glxProxy/glxext.c @@ -273,19 +273,11 @@ void GlxExtensionInit(void) 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. |