diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-22 09:17:19 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-22 09:17:19 +0000 |
| commit | 348130c450be8b5c4abcb03272b326434e3f5022 (patch) | |
| tree | 413685260aa63ea6b530af4898603a40f441b768 /xorg-server/exa | |
| parent | 4f736752bbdf3bbf1a6325af7ad470198aa5a82a (diff) | |
| download | vcxsrv-348130c450be8b5c4abcb03272b326434e3f5022.tar.gz vcxsrv-348130c450be8b5c4abcb03272b326434e3f5022.tar.bz2 vcxsrv-348130c450be8b5c4abcb03272b326434e3f5022.zip | |
Updated to xorg-server-1.7.99.902
Diffstat (limited to 'xorg-server/exa')
| -rw-r--r-- | xorg-server/exa/Makefile.in | 3 | ||||
| -rw-r--r-- | xorg-server/exa/exa.c | 4 |
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; |