frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into my-XACE-SELINUX

This commit is contained in:
Eamon Walsh 2007-02-15 09:47:20 -05:00 committed by Eamon Walsh
parent 04632835b7 811675733e
commit f452507ca9
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -25,7 +25,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57) AC_PREREQ(2.57)
dnl This is the not the Xorg version number, it's the server version number. dnl This is the not the Xorg version number, it's the server version number.
dnl Yes, that's weird. 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]) AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE 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(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes])
AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_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) 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(__XKBDEFRULES__, "xorg", [Default XKB rules])
AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data]) AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data])

2
hw/kdrive/ephyr/ephyr.c
View File

@ -675,6 +675,8 @@ ephyrRestore (KdCardInfo *card)
void void
ephyrScreenFini (KdScreenInfo *screen) ephyrScreenFini (KdScreenInfo *screen)
{ {
xfree(screen->driver);
screen->driver = NULL;
} }
/* /*

2
os/connection.c
View File

@ -1066,6 +1066,8 @@ CloseDownConnection(ClientPtr client)
XdmcpCloseDisplay(oc->fd); XdmcpCloseDisplay(oc->fd);
#endif #endif
CloseDownFileDescriptor(oc); CloseDownFileDescriptor(oc);
FreeOsBuffers(oc);
xfree(client->osPrivate);
client->osPrivate = (pointer)NULL; client->osPrivate = (pointer)NULL;
if (auditTrailLevel > 1) if (auditTrailLevel > 1)
AuditF("client %d disconnected\n", client->index); AuditF("client %d disconnected\n", client->index);