xserver: Branch 'server-1.14-branch' - 4 commits
Matt Dew
marcoz at kemper.freedesktop.org
Mon Oct 21 20:09:49 PDT 2013
configure.ac | 2 +-
dix/window.c | 1 +
hw/xfree86/parser/write.c | 3 ++-
include/xorg-config.h.in | 3 +++
test/hashtabletest.c | 4 ++++
5 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit ec6de521161d5c45885c8751c250d3fabcbc2194
Merge: 1427621 a1985e8
Author: Matt Dew <marcoz at osource.org>
Date: Mon Oct 21 21:03:29 2013 -0600
Merge commit 'a1985e892f5b5f0959235a631d8bcf676b78bfbc' into server-1.14-branch
commit a1985e892f5b5f0959235a631d8bcf676b78bfbc
Author: Julien Cristau <jcristau at debian.org>
Date: Sat Jul 27 12:09:07 2013 +0200
dix: add missing include for DeleteWindowFromAnySelections
Fixes build error with XACE disabled:
window.c:886:5: error: implicit declaration of function 'DeleteWindowFromAnySelections' [-Werror=implicit-function-declaration]
DeleteWindowFromAnySelections(pWin);
^
Debian bug#701372
Reported-by: Matthias Klose <doko at debian.org>
Signed-off-by: Julien Cristau <jcristau at debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
(cherry picked from commit fe7463b8ce0de301c2f82b108c93963424f77219)
diff --git a/dix/window.c b/dix/window.c
index 8e61779..1cf46dc 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -126,6 +126,7 @@ Equipment Corporation.
#ifdef COMPOSITE
#include "compint.h"
#endif
+#include "selection.h"
#include "privates.h"
#include "xace.h"
commit 19c2d516c2b5182e8b45649485aa3123b229b66a
Author: Julien Cristau <jcristau at debian.org>
Date: Fri Aug 2 20:07:36 2013 +0200
xfree86: improve check for posix saved ids
Replace hardcoded SVR4 || linux || CSRG_BASED with an autoconf check and
the _POSIX_SAVED_IDS macro.
Suggested-by: Mark Kettenis <mark.kettenis at xs4all.nl>
Signed-off-by: Julien Cristau <jcristau at debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Reviewed-by: Mark Kettenis <kettenis at openbsd.org>.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
(cherry picked from commit c218ba8423a73a7a643cb17789db8a1dd0901ca6)
diff --git a/configure.ac b/configure.ac
index 9bc7c73..8ac9cb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -215,7 +215,7 @@ AC_SUBST(DLOPEN_LIBS)
dnl Checks for library functions.
AC_CHECK_FUNCS([backtrace ffs geteuid getuid issetugid getresuid \
getdtablesize getifaddrs getpeereid getpeerucred getzoneid \
- mmap shmctl64 strncasecmp vasprintf vsnprintf walkcontext])
+ mmap seteuid shmctl64 strncasecmp vasprintf vsnprintf walkcontext])
AC_REPLACE_FUNCS([strcasecmp strcasestr strlcat strlcpy strndup])
dnl Find the math libary, then check for cbrt function in it.
diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c
index 9c706a0..26739b9 100644
--- a/hw/xfree86/parser/write.c
+++ b/hw/xfree86/parser/write.c
@@ -55,6 +55,7 @@
#include <xorg-config.h>
#endif
+#include "os.h"
#include "xf86Parser.h"
#include "xf86tokens.h"
#include "Configint.h"
@@ -65,7 +66,7 @@
#include <signal.h>
#include <errno.h>
-#if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
+#if defined(HAVE_SETEUID) && defined(_POSIX_SAVED_IDS) && _POSIX_SAVED_IDS > 0
#define HAS_SAVED_IDS_AND_SETEUID
#endif
#if defined(WIN32)
diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
index a71b25d..0df31ae 100644
--- a/include/xorg-config.h.in
+++ b/include/xorg-config.h.in
@@ -139,4 +139,7 @@
/* Have X server platform bus support */
#undef XSERVER_PLATFORM_BUS
+/* Define to 1 if you have the `seteuid' function. */
+#undef HAVE_SETEUID
+
#endif /* _XORG_CONFIG_H_ */
commit b39a6ab645815a6012d9b2feaa049336ea09aa76
Author: Julien Cristau <jcristau at debian.org>
Date: Fri Aug 2 23:46:00 2013 +0200
test: include dix-config.h in hashtabletest.c
Missing _XSERVER64 define caused inconsistent sizeof(XID) between the
test and hashtable code, leading to test failures on 64bit big endian
archs like s390x or ppc64.
Signed-off-by: Julien Cristau <jcristau at debian.org>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
(cherry picked from commit 930c6ff15d437dfb0f897e8cb4253abba70819cc)
diff --git a/test/hashtabletest.c b/test/hashtabletest.c
index 64c7091..6af14a8 100644
--- a/test/hashtabletest.c
+++ b/test/hashtabletest.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <misc.h>
#include <stdlib.h>
#include <stdio.h>
More information about the xorg-commit
mailing list