aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/os
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-11-05 13:26:04 +0100
committerMihai Moldovan <ionic@ionic.de>2018-02-27 03:13:07 +0100
commit2d59daca2fbc7ac26aa2b47c45dfed51278f0e71 (patch)
tree3c0ddd2ea7084583a9baa54706c35f92cfd2fce4 /nx-X11/programs/Xserver/os
parent78724c4868312044698005325025221e11d7159a (diff)
downloadnx-libs-2d59daca2fbc7ac26aa2b47c45dfed51278f0e71.tar.gz
nx-libs-2d59daca2fbc7ac26aa2b47c45dfed51278f0e71.tar.bz2
nx-libs-2d59daca2fbc7ac26aa2b47c45dfed51278f0e71.zip
Lift os to XORG-7_1 state
Diffstat (limited to 'nx-X11/programs/Xserver/os')
-rw-r--r--nx-X11/programs/Xserver/os/osdep.h2
-rw-r--r--nx-X11/programs/Xserver/os/utils.c3
-rw-r--r--nx-X11/programs/Xserver/os/xdmauth.c10
3 files changed, 6 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/os/osdep.h b/nx-X11/programs/Xserver/os/osdep.h
index d3e9d0b33..01ae7c3fb 100644
--- a/nx-X11/programs/Xserver/os/osdep.h
+++ b/nx-X11/programs/Xserver/os/osdep.h
@@ -111,9 +111,11 @@ SOFTWARE.
/* MAXSELECT is the number of fds that select() can handle */
#define MAXSELECT (sizeof(fd_set) * NBBY)
+#ifndef HAS_GETDTABLESIZE
#if !defined(SVR4) && !defined(SYSV)
#define HAS_GETDTABLESIZE
#endif
+#endif
#include <stddef.h>
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index a8155f3b4..2edd8dd3f 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -168,9 +168,6 @@ Bool noDamageExtension = FALSE;
#ifdef DBE
Bool noDbeExtension = FALSE;
#endif
-#ifdef DPSEXT
-Bool noDPSExtension = FALSE;
-#endif
#ifdef DPMSExtension
Bool noDPMSExtension = FALSE;
#endif
diff --git a/nx-X11/programs/Xserver/os/xdmauth.c b/nx-X11/programs/Xserver/os/xdmauth.c
index 4a59b48f2..eb89f4bc1 100644
--- a/nx-X11/programs/Xserver/os/xdmauth.c
+++ b/nx-X11/programs/Xserver/os/xdmauth.c
@@ -439,10 +439,12 @@ XdmToID (unsigned short cookie_length, char *cookie)
{
free (client);
free (cookie);
+ free (plain);
return auth->id;
}
}
free (cookie);
+ free (plain);
return (XID) -1;
}
@@ -464,10 +466,9 @@ XdmFromID (XID id, unsigned short *data_lenp, char **datap)
int
XdmRemoveCookie (unsigned short data_length, char *data)
{
- XdmAuthorizationPtr auth, prev;
+ XdmAuthorizationPtr auth;
XdmAuthKeyPtr key_bits, rho_bits;
- prev = 0;
switch (data_length)
{
case 16:
@@ -487,10 +488,7 @@ XdmRemoveCookie (unsigned short data_length, char *data)
if (XdmcpCompareKeys (rho_bits, &auth->rho) &&
XdmcpCompareKeys (key_bits, &auth->key))
{
- if (prev)
- prev->next = auth->next;
- else
- xdmAuth = auth->next;
+ xdmAuth = auth->next;
free (auth);
return 1;
}