aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/exa
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-03-22 10:29:25 +0000
committermarha <marha@users.sourceforge.net>2010-03-22 10:29:25 +0000
commitac80633ce275edddaa3e4fa2ae0c048ed00f7d74 (patch)
tree7d4ceffed59f2782533d3485c075f605ab1b9c61 /xorg-server/exa
parent6fc6cb8c935fab174e4582909c1cb4f12bd598bf (diff)
downloadvcxsrv-ac80633ce275edddaa3e4fa2ae0c048ed00f7d74.tar.gz
vcxsrv-ac80633ce275edddaa3e4fa2ae0c048ed00f7d74.tar.bz2
vcxsrv-ac80633ce275edddaa3e4fa2ae0c048ed00f7d74.zip
svn merge -c505 ^/branches/released .
Diffstat (limited to 'xorg-server/exa')
-rw-r--r--xorg-server/exa/Makefile.in3
-rw-r--r--xorg-server/exa/exa.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/xorg-server/exa/Makefile.in b/xorg-server/exa/Makefile.in
index c3572c586..0ff5597bb 100644
--- a/xorg-server/exa/Makefile.in
+++ b/xorg-server/exa/Makefile.in
@@ -152,6 +152,7 @@ DARWIN_LIBS = @DARWIN_LIBS@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
DEFAULT_LIBRARY_PATH = @DEFAULT_LIBRARY_PATH@
+DEFAULT_LOGDIR = @DEFAULT_LOGDIR@
DEFAULT_LOGPREFIX = @DEFAULT_LOGPREFIX@
DEFAULT_MODULE_PATH = @DEFAULT_MODULE_PATH@
DEFS = @DEFS@
@@ -283,6 +284,8 @@ RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
SED = @SED@
+SELINUX_CFLAGS = @SELINUX_CFLAGS@
+SELINUX_LIBS = @SELINUX_LIBS@
SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
SET_MAKE = @SET_MAKE@
SHA1_CFLAGS = @SHA1_CFLAGS@
diff --git a/xorg-server/exa/exa.c b/xorg-server/exa/exa.c
index c5ac7dec2..590d9a500 100644
--- a/xorg-server/exa/exa.c
+++ b/xorg-server/exa/exa.c
@@ -417,8 +417,8 @@ exaFinishAccess(DrawablePtr pDrawable, int index)
/* Catch unbalanced Prepare/FinishAccess calls. */
if (i == EXA_NUM_PREPARE_INDICES)
- EXA_FatalErrorDebug(("EXA bug: FinishAccess called without PrepareAccess for pixmap 0x%p.\n",
- pPixmap));
+ EXA_FatalErrorDebugWithRet(("EXA bug: FinishAccess called without PrepareAccess for pixmap 0x%p.\n",
+ pPixmap),);
pExaScr->access[i].pixmap = NULL;