diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-09 12:47:28 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-09 12:47:28 +0000 |
| commit | ca5d010292c57383da523797a095ac847e1fe103 (patch) | |
| tree | c1ec0ec785c855bc5815714f6685deb10acdad0a /xorg-server/hw | |
| parent | 837a26770cb9f1d8d7a4ce40e06db9bb05683702 (diff) | |
| download | vcxsrv-ca5d010292c57383da523797a095ac847e1fe103.tar.gz vcxsrv-ca5d010292c57383da523797a095ac847e1fe103.tar.bz2 vcxsrv-ca5d010292c57383da523797a095ac847e1fe103.zip | |
Enable only functions defined in windows XP
Enabled IPV6 compilation
Diffstat (limited to 'xorg-server/hw')
| -rw-r--r-- | xorg-server/hw/xwin/winauth.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/xorg-server/hw/xwin/winauth.c b/xorg-server/hw/xwin/winauth.c index 10bce693b..b603f70f5 100644 --- a/xorg-server/hw/xwin/winauth.c +++ b/xorg-server/hw/xwin/winauth.c @@ -32,6 +32,10 @@ #include <xwin-config.h>
#endif
+#define GC X11_GC /* To avoid compilation errors later when including win.h (which also defines the GC type) */
+#include <X11/Xlib.h>
+#undef GC
+
#include "win.h"
/* Includes for authorization */
@@ -136,7 +140,6 @@ GenerateAuthorization( Bool
winGenerateAuthorization (void)
{
- Bool fFreeAuth = FALSE;
SecurityAuthorizationPtr pAuth = NULL;
/* Call OS layer to generate authorization key */
@@ -187,19 +190,16 @@ winGenerateAuthorization (void) pAuth))
{
ErrorF ("winGenerateAuthorization - AddResource failed for auth.\n");
- fFreeAuth = TRUE;
goto auth_bailout;
}
/* Don't free the auth data, since it is still used internally */
- pAuth = NULL;
#endif
return TRUE;
auth_bailout:
- if (fFreeAuth)
- free(pAuth);
+ free(pAuth);
return FALSE;
}
@@ -208,6 +208,7 @@ winGenerateAuthorization (void) void
winSetAuthorization(void)
{
+ if (g_pAuthData)
XSetAuthorization (AUTH_NAME,
strlen (AUTH_NAME),
g_pAuthData,
|