aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/loader
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-03-22 09:17:19 +0000
committermarha <marha@users.sourceforge.net>2010-03-22 09:17:19 +0000
commit348130c450be8b5c4abcb03272b326434e3f5022 (patch)
tree413685260aa63ea6b530af4898603a40f441b768 /xorg-server/hw/xfree86/loader
parent4f736752bbdf3bbf1a6325af7ad470198aa5a82a (diff)
downloadvcxsrv-348130c450be8b5c4abcb03272b326434e3f5022.tar.gz
vcxsrv-348130c450be8b5c4abcb03272b326434e3f5022.tar.bz2
vcxsrv-348130c450be8b5c4abcb03272b326434e3f5022.zip
Updated to xorg-server-1.7.99.902
Diffstat (limited to 'xorg-server/hw/xfree86/loader')
-rw-r--r--xorg-server/hw/xfree86/loader/Makefile.in3
-rw-r--r--xorg-server/hw/xfree86/loader/sdksyms.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/xorg-server/hw/xfree86/loader/Makefile.in b/xorg-server/hw/xfree86/loader/Makefile.in
index 807676bf4..37726d5dc 100644
--- a/xorg-server/hw/xfree86/loader/Makefile.in
+++ b/xorg-server/hw/xfree86/loader/Makefile.in
@@ -126,6 +126,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@
@@ -257,6 +258,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/hw/xfree86/loader/sdksyms.c b/xorg-server/hw/xfree86/loader/sdksyms.c
index 66eb840cf..ade24a12d 100644
--- a/xorg-server/hw/xfree86/loader/sdksyms.c
+++ b/xorg-server/hw/xfree86/loader/sdksyms.c
@@ -390,6 +390,7 @@ _X_HIDDEN void *xorg_symbols[] = {
(void *) &OsVendorInit,
(void *) &OsBlockSignals,
(void *) &OsReleaseSignals,
+ (void *) &OsAbort,
(void *) &System,
(void *) &Popen,
(void *) &Pclose,
@@ -593,6 +594,7 @@ _X_HIDDEN void *xorg_symbols[] = {
(void *) &LegalModifier,
(void *) &ProcessInputEvents,
(void *) &InitInput,
+ (void *) &CloseInput,
(void *) &GetMaximumEventsNum,
(void *) &GetEventList,
(void *) &InitEventList,
@@ -1660,6 +1662,7 @@ _X_HIDDEN void *xorg_symbols[] = {
(void *) &xf86QueryLargestOffscreenArea,
(void *) &xf86QueryLargestOffscreenLinear,
(void *) &inputInfo,
+ (void *) &syncEvents,
(void *) &CloseInputDevice,
(void *) &AddOtherInputDevices,
(void *) &OpenInputDevice,