andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug #3407: Clean out ancient #ifdef X11R5 conditionals.

Browse Source
This commit is contained in:
Adam Jackson 2005-05-30 18:36:19 +00:00
parent cebd7348d2
commit 547c47aaea
3 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GL/glx/glxext.c
View File

@ -221,15 +221,9 @@ void GlxExtensionInit(void)
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
int i; int i;
#ifdef X11R5
__glXContextRes = CreateNewResourceType(ContextGone);
__glXClientRes = CreateNewResourceType(ClientGone);
__glXPixmapRes = CreateNewResourceType(PixmapGone);
#else
__glXContextRes = CreateNewResourceType((DeleteType)ContextGone); __glXContextRes = CreateNewResourceType((DeleteType)ContextGone);
__glXClientRes = CreateNewResourceType((DeleteType)ClientGone); __glXClientRes = CreateNewResourceType((DeleteType)ClientGone);
__glXPixmapRes = CreateNewResourceType((DeleteType)PixmapGone); __glXPixmapRes = CreateNewResourceType((DeleteType)PixmapGone);
#endif
/* /*
** Add extension to server extensions. ** Add extension to server extensions.

4
GL/glx/glxscreens.c
View File

@ -298,11 +298,7 @@ void __glXScreenInit(GLint numscreens)
__glXActiveScreens[i].GLXversion = __glXStrdup(GLXServerVersion); __glXActiveScreens[i].GLXversion = __glXStrdup(GLXServerVersion);
__glXActiveScreens[i].GLXextensions = __glXStrdup(GLXServerExtensions); __glXActiveScreens[i].GLXextensions = __glXStrdup(GLXServerExtensions);
#ifdef X11R5
__glXDrawableRes = CreateNewResourceType(DrawableGone);
#else
__glXDrawableRes = CreateNewResourceType((DeleteType)DrawableGone); __glXDrawableRes = CreateNewResourceType((DeleteType)DrawableGone);
#endif
wrapPositionWindow(i); wrapPositionWindow(i);
} }
} }

8
hw/dmx/glxProxy/glxext.c
View File

@ -273,19 +273,11 @@ void GlxExtensionInit(void)
return; return;
} }
#ifdef X11R5
__glXContextRes = CreateNewResourceType(ContextGone);
__glXClientRes = CreateNewResourceType(ClientGone);
__glXPixmapRes = CreateNewResourceType(PixmapGone);
__glXWindowRes = CreateNewResourceType(WindowGone);
__glXPbufferRes = CreateNewResourceType(PbufferGone);
#else
__glXContextRes = CreateNewResourceType((DeleteType)ContextGone); __glXContextRes = CreateNewResourceType((DeleteType)ContextGone);
__glXClientRes = CreateNewResourceType((DeleteType)ClientGone); __glXClientRes = CreateNewResourceType((DeleteType)ClientGone);
__glXPixmapRes = CreateNewResourceType((DeleteType)PixmapGone); __glXPixmapRes = CreateNewResourceType((DeleteType)PixmapGone);
__glXWindowRes = CreateNewResourceType((DeleteType)WindowGone); __glXWindowRes = CreateNewResourceType((DeleteType)WindowGone);
__glXPbufferRes = CreateNewResourceType((DeleteType)PbufferGone); __glXPbufferRes = CreateNewResourceType((DeleteType)PbufferGone);
#endif
/* /*
** Add extension to server extensions. ** Add extension to server extensions.