diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-05-30 18:36:19 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-05-30 18:36:19 +0000 |
| commit | 547c47aaea9f31f7c873376b0db859c1c1d3d918 (patch) | |
| tree | 561ae8c37e80fb9649e4dca1a4fb862e506e13ac /GL | |
| parent | cebd7348d271591b7ebeebe3b332f835cfa8a068 (diff) | |
Bug #3407: Clean out ancient #ifdef X11R5 conditionals.
Diffstat (limited to 'GL')
| -rw-r--r-- | GL/glx/glxext.c | 6 | ||||
| -rw-r--r-- | GL/glx/glxscreens.c | 4 |
2 files changed, 0 insertions, 10 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); } } |