diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2018-02-27 03:20:46 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-27 03:20:46 +0100 |
| commit | 7a4aa75de1930b88b923b878e222eb8588e33cdf (patch) | |
| tree | cea4be19fcd1e0d3471fe8cec8f98696f355d660 /nx-X11 | |
| parent | 78724c4868312044698005325025221e11d7159a (diff) | |
| parent | 41ff6b0344482f3146aeaaea184911b5e40df9a6 (diff) | |
| download | nx-libs-7a4aa75de1930b88b923b878e222eb8588e33cdf.tar.gz nx-libs-7a4aa75de1930b88b923b878e222eb8588e33cdf.tar.bz2 nx-libs-7a4aa75de1930b88b923b878e222eb8588e33cdf.zip | |
Merge branch 'uli42-pr/update_os' into 3.6.x
Attributes GH PR #651: https://github.com/ArcticaProject/nx-libs/pull/651
Diffstat (limited to 'nx-X11')
| -rw-r--r-- | nx-X11/programs/Xserver/os/WaitFor.c | 1 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/osdep.h | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/utils.c | 3 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/xdmauth.c | 10 |
4 files changed, 7 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/os/WaitFor.c b/nx-X11/programs/Xserver/os/WaitFor.c index cb97039a7..9133adff4 100644 --- a/nx-X11/programs/Xserver/os/WaitFor.c +++ b/nx-X11/programs/Xserver/os/WaitFor.c @@ -826,6 +826,7 @@ SetScreenSaverTimer(void) MIN(ScreenSaverTime, timeout) : ScreenSaverTime; } + #ifdef SCREENSAVER if (timeout && !screenSaverSuspended) { #else 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; } |