Merge branch 'master' into my-XACE-SELINUX
This commit is contained in:
commit
f452507ca9
|
@ -25,7 +25,7 @@ dnl Process this file with autoconf to create configure.
|
|||
AC_PREREQ(2.57)
|
||||
dnl This is the not the Xorg version number, it's the server version number.
|
||||
dnl Yes, that's weird.
|
||||
AC_INIT([xorg-server], 1.2.99.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
|
||||
AC_INIT([xorg-server], 1.3.99.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
|
||||
AC_CONFIG_SRCDIR([Makefile.am])
|
||||
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
|
||||
AM_MAINTAINER_MODE
|
||||
|
@ -1751,6 +1751,11 @@ AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && test "x$XFAKE" = xyes])
|
|||
AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes])
|
||||
AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
|
||||
|
||||
dnl XDarwin DDX (FIXME)
|
||||
AM_CONDITIONAL(XQUARTZ, false)
|
||||
AM_CONDITIONAL(HAVE_X_PLUGIN, false)
|
||||
AM_CONDITIONAL(HAVE_AGL_FRAMEWORK, false)
|
||||
|
||||
dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest servers)
|
||||
AC_DEFINE(__XKBDEFRULES__, "xorg", [Default XKB rules])
|
||||
AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data])
|
||||
|
|
|
@ -675,6 +675,8 @@ ephyrRestore (KdCardInfo *card)
|
|||
void
|
||||
ephyrScreenFini (KdScreenInfo *screen)
|
||||
{
|
||||
xfree(screen->driver);
|
||||
screen->driver = NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -1066,6 +1066,8 @@ CloseDownConnection(ClientPtr client)
|
|||
XdmcpCloseDisplay(oc->fd);
|
||||
#endif
|
||||
CloseDownFileDescriptor(oc);
|
||||
FreeOsBuffers(oc);
|
||||
xfree(client->osPrivate);
|
||||
client->osPrivate = (pointer)NULL;
|
||||
if (auditTrailLevel > 1)
|
||||
AuditF("client %d disconnected\n", client->index);
|
||||
|
|
Loading…
Reference in New Issue
Block a user