diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-14 13:15:50 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-14 13:15:50 +0000 |
| commit | e2eb44705a8e4886d81b75c12e68aaebe9946439 (patch) | |
| tree | 00639c4f594cdaf4cb08d30dfdb4d4a4e38bc16c /xorg-server/glx | |
| parent | 2dc9ef67a51796a1e25bd31eb58663a8023ddd80 (diff) | |
| parent | 0cf9b03f4990f61640dc35dfac250f929b57b4ed (diff) | |
| download | vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.tar.gz vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.tar.bz2 vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/glx')
| -rw-r--r-- | xorg-server/glx/glxcmds.c | 2 | ||||
| -rw-r--r-- | xorg-server/glx/glxscreens.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/glx/glxcmds.c b/xorg-server/glx/glxcmds.c index a4ac2b86b..35b2c4ee2 100644 --- a/xorg-server/glx/glxcmds.c +++ b/xorg-server/glx/glxcmds.c @@ -2437,7 +2437,7 @@ int __glXDisp_ClientInfo(__GLXclientState *cl, GLbyte *pc) cl->GLClientminorVersion = req->minor;
free(cl->GLClientextensions);
buf = (const char *)(req+1);
- cl->GLClientextensions = xstrdup(buf);
+ cl->GLClientextensions = strdup(buf);
return Success;
}
diff --git a/xorg-server/glx/glxscreens.c b/xorg-server/glx/glxscreens.c index 3d91e20d2..3ba8a64fc 100644 --- a/xorg-server/glx/glxscreens.c +++ b/xorg-server/glx/glxscreens.c @@ -360,9 +360,9 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen) return;
pGlxScreen->pScreen = pScreen;
- pGlxScreen->GLextensions = xstrdup(GLServerExtensions);
- pGlxScreen->GLXvendor = xstrdup(GLXServerVendorName);
- pGlxScreen->GLXextensions = xstrdup(GLXServerExtensions);
+ pGlxScreen->GLextensions = strdup(GLServerExtensions);
+ pGlxScreen->GLXvendor = strdup(GLXServerVendorName);
+ pGlxScreen->GLXextensions = strdup(GLXServerExtensions);
/* All GLX providers must support all of the functionality required for at
* least GLX 1.2. If the provider supports a higher version, the GLXminor
|