From 8d38172d866775594af3185ae3fbd8d750677650 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 14 Feb 2010 13:47:55 +0000 Subject: Updated to xorg-server-1.7.99.901 --- xorg-server/include/Makefile.in | 6 +++++- xorg-server/include/input.h | 1 + xorg-server/include/misc.h | 3 +++ xorg-server/include/xwin-config.h.in | 12 +++++++++++- 4 files changed, 20 insertions(+), 2 deletions(-) (limited to 'xorg-server/include') diff --git a/xorg-server/include/Makefile.in b/xorg-server/include/Makefile.in index 1420c30ed..3fe3a0519 100644 --- a/xorg-server/include/Makefile.in +++ b/xorg-server/include/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -274,8 +274,11 @@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@ STRIP = @STRIP@ +SYSCONFDIR = @SYSCONFDIR@ TSLIB_CFLAGS = @TSLIB_CFLAGS@ TSLIB_LIBS = @TSLIB_LIBS@ +UDEV_CFLAGS = @UDEV_CFLAGS@ +UDEV_LIBS = @UDEV_LIBS@ UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ VERSION = @VERSION@ @@ -335,6 +338,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@ XWIN_SYS_LIBS = @XWIN_SYS_LIBS@ YACC = @YACC@ YFLAGS = @YFLAGS@ +__XCONFIGDIR__ = @__XCONFIGDIR__@ __XCONFIGFILE__ = @__XCONFIGFILE__@ abi_ansic = @abi_ansic@ abi_extension = @abi_extension@ diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h index 7a6242d08..4a845bedf 100644 --- a/xorg-server/include/input.h +++ b/xorg-server/include/input.h @@ -215,6 +215,7 @@ typedef struct _InputAttributes { char *product; char *vendor; char *device; + char **tags; /* null-terminated */ uint32_t flags; } InputAttributes; diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h index 877c682d4..62d813e0c 100644 --- a/xorg-server/include/misc.h +++ b/xorg-server/include/misc.h @@ -210,6 +210,9 @@ pad_to_int32(const int bytes) { return (((bytes) + 3) & ~3); } +extern char** +xstrtokenize(const char *str, const char* separators); + /* some macros to help swap requests, replies, and events */ #define LengthRestB(stuff) \ diff --git a/xorg-server/include/xwin-config.h.in b/xorg-server/include/xwin-config.h.in index c8de11073..21ceb29cf 100644 --- a/xorg-server/include/xwin-config.h.in +++ b/xorg-server/include/xwin-config.h.in @@ -12,7 +12,7 @@ /* Cygwin has /dev/windows for signaling new win32 messages */ #undef HAS_DEVWINDOWS -/* Switch on debug messages */ +/* Switch on debug messages */ #undef CYGDEBUG #undef CYGWINDOWING_DEBUG #undef CYGMULTIWINDOW_DEBUG @@ -22,3 +22,13 @@ /* Do we require our own snprintf? */ #undef NEED_SNPRINTF + +/* Short vendor name */ +#undef XVENDORNAMESHORT + +/* Vendor web address for support */ +#undef __VENDORDWEBSUPPORT__ + +/* Location of system.XWinrc */ +#undef SYSCONFDIR + -- cgit v1.2.3