From 5b178ff5a5f0b6e481cf9fd9749eb7ef9581c987 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 8 Dec 2011 09:26:34 +0100 Subject: git update glproto libX11 libxcb mesa xserver 8 dec 2011 --- xorg-server/include/dix-config.h.in | 85 ++++++++++++------------------------ xorg-server/include/dix.h | 2 + xorg-server/include/os.h | 8 ++-- xorg-server/include/xkb-config.h.in | 3 -- xorg-server/include/xorg-server.h.in | 21 +++++++++ xorg-server/include/xwin-config.h.in | 3 -- 6 files changed, 56 insertions(+), 66 deletions(-) (limited to 'xorg-server/include') diff --git a/xorg-server/include/dix-config.h.in b/xorg-server/include/dix-config.h.in index e1d3a9eaa..3fb641367 100644 --- a/xorg-server/include/dix-config.h.in +++ b/xorg-server/include/dix-config.h.in @@ -51,27 +51,9 @@ /* Support XDM-AUTH*-1 */ #undef HASXDMAUTH -/* Define to 1 if you have the `getdtablesize' function. */ -#undef HAS_GETDTABLESIZE - -/* Define to 1 if you have the `getifaddrs' function. */ -#undef HAS_GETIFADDRS - -/* Define to 1 if you have the `getpeereid' function. */ -#undef HAS_GETPEEREID - -/* Define to 1 if you have the `getpeerucred' function. */ -#undef HAS_GETPEERUCRED - -/* Define to 1 if you have the `mmap' function. */ -#undef HAS_MMAP - /* Support SHM */ #undef HAS_SHM -/* Have the 'strlcpy' function */ -#undef HAS_STRLCPY - /* Define to 1 if you have the header file. */ #undef HAVE_ASM_MTRR_H @@ -81,7 +63,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_BYTESWAP_H -/* Define to 1 if you have cbrt */ +/* Define to 1 if you have the `cbrt' function. */ #undef HAVE_CBRT /* Define to 1 if you have the header file. */ @@ -94,23 +76,26 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -#undef HAVE_DOPRNT - /* Have execinfo.h */ #undef HAVE_EXECINFO_H /* Define to 1 if you have the header file. */ #undef HAVE_FCNTL_H -/* Define to 1 if you have the `geteuid' function. */ -#undef HAVE_GETEUID +/* Define to 1 if you have the `ffs' function. */ +#undef HAVE_FFS -/* Define to 1 if you have the `getisax' function. */ -#undef HAVE_GETISAX +/* Define to 1 if you have the `getdtablesize' function. */ +#undef HAVE_GETDTABLESIZE + +/* Define to 1 if you have the `getifaddrs' function. */ +#undef HAVE_GETIFADDRS -/* Define to 1 if you have the `getuid' function. */ -#undef HAVE_GETUID +/* Define to 1 if you have the `getpeereid' function. */ +#undef HAVE_GETPEEREID + +/* Define to 1 if you have the `getpeerucred' function. */ +#undef HAVE_GETPEERUCRED /* Define to 1 if you have the `getzoneid' function. */ #undef HAVE_GETZONEID @@ -136,9 +121,6 @@ /* Define to 1 if you have the libdispatch (GCD) available */ #undef HAVE_LIBDISPATCH -/* Define to 1 if you have the `link' function. */ -#undef HAVE_LINK - /* Define to 1 if you have the header file. */ #undef HAVE_LINUX_AGPGART_H @@ -148,8 +130,8 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LINUX_FB_H -/* Define to 1 if you have the `mkstemp' function. */ -#undef HAVE_MKSTEMP +/* Define to 1 if you have the `mmap' function. */ +#undef HAVE_MMAP /* Define to 1 if you have the header file. */ #undef HAVE_NDBM_H @@ -181,8 +163,20 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strchr' function. */ -#undef HAVE_STRCHR +/* Define to 1 if you have the `strcasecmp' function. */ +#undef HAVE_STRCASECMP + +/* Define to 1 if you have the `strcasestr' function. */ +#undef HAVE_STRCASESTR + +/* Define to 1 if you have the `strncasecmp' function. */ +#undef HAVE_STRNCASECMP + +/* Define to 1 if you have the `strlcat' function. */ +#undef HAVE_STRLCAT + +/* Define to 1 if you have the `strlcpy' function. */ +#undef HAVE_STRLCPY /* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H @@ -193,12 +187,6 @@ /* Define to 1 if you have the `strndup' function. */ #undef HAVE_STRNDUP -/* Define to 1 if you have the `strrchr' function. */ -#undef HAVE_STRRCHR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if SYSV IPC is available */ #undef HAVE_SYSV_IPC @@ -234,9 +222,6 @@ /* Have /dev/urandom */ #undef HAVE_URANDOM -/* Define to 1 if you have the `vprintf' function. */ -#undef HAVE_VPRINTF - /* Define to 1 if you have the `vasprintf' function. */ #undef HAVE_VASPRINTF @@ -432,18 +417,6 @@ /* Define to 64-bit byteswap macro */ #undef bswap_64 -/* Need the strcasecmp function. */ -#undef NEED_STRCASECMP - -/* Need the strncasecmp function. */ -#undef NEED_STRNCASECMP - -/* Need the strcasestr function. */ -#undef NEED_STRCASESTR - -/* Define to 1 if you have the `ffs' function. */ -#undef HAVE_FFS - /* The compiler supported TLS storage class, prefering initial-exec if tls_model is supported */ #undef TLS diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h index 34661f3b6..f98c87b04 100644 --- a/xorg-server/include/dix.h +++ b/xorg-server/include/dix.h @@ -529,7 +529,9 @@ extern _X_EXPORT void ScreenRestructured (ScreenPtr pScreen); #endif +#ifndef HAVE_FFS extern _X_EXPORT int ffs(int i); +#endif /* diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h index 22983814b..1fd5367c4 100644 --- a/xorg-server/include/os.h +++ b/xorg-server/include/os.h @@ -472,22 +472,22 @@ extern _X_EXPORT void ddxGiveUp(enum ExitCode error); extern _X_EXPORT int TimeSinceLastInputEvent(void); /* strcasecmp.c */ -#if NEED_STRCASECMP +#ifndef HAVE_STRCASECMP #define strcasecmp xstrcasecmp extern _X_EXPORT int xstrcasecmp(const char *s1, const char *s2); #endif -#if NEED_STRNCASECMP +#ifndef HAVE_STRNCASECMP #define strncasecmp xstrncasecmp extern _X_EXPORT int xstrncasecmp(const char *s1, const char *s2, size_t n); #endif -#if NEED_STRCASESTR +#ifndef HAVE_STRCASESTR #define strcasestr xstrcasestr extern _X_EXPORT char *xstrcasestr(const char *s, const char *find); #endif -#ifndef HAS_STRLCPY +#ifndef HAVE_STRLCPY extern _X_EXPORT size_t strlcpy(char *dst, const char *src, size_t siz); extern _X_EXPORT size_t strlcat(char *dst, const char *src, size_t siz); #endif diff --git a/xorg-server/include/xkb-config.h.in b/xorg-server/include/xkb-config.h.in index d3cdd1916..7b6a671b8 100644 --- a/xorg-server/include/xkb-config.h.in +++ b/xorg-server/include/xkb-config.h.in @@ -29,7 +29,4 @@ /* XKB output dir for compiled keymaps. */ #undef XKM_OUTPUT_DIR -/* Do not have `strcasecmp'. */ -#undef NEED_STRCASECMP - #endif /* _XKB_CONFIG_H_ */ diff --git a/xorg-server/include/xorg-server.h.in b/xorg-server/include/xorg-server.h.in index b10b9949e..8086f32ae 100644 --- a/xorg-server/include/xorg-server.h.in +++ b/xorg-server/include/xorg-server.h.in @@ -37,6 +37,27 @@ /* Support SHM */ #undef HAS_SHM +/* Define to 1 if you have the `ffs' function. */ +#undef HAVE_FFS + +/* Define to 1 if you have the `strcasecmp' function. */ +#undef HAVE_STRCASECMP + +/* Define to 1 if you have the `strcasestr' function. */ +#undef HAVE_STRCASESTR + +/* Define to 1 if you have the `strlcat' function. */ +#undef HAVE_STRLCAT + +/* Define to 1 if you have the `strlcpy' function. */ +#undef HAVE_STRLCPY + +/* Define to 1 if you have the `strncasecmp' function. */ +#undef HAVE_STRNCASECMP + +/* Define to 1 if you have the `strndup' function. */ +#undef HAVE_STRNDUP + /* Support IPv6 for TCP connections */ #undef IPv6 diff --git a/xorg-server/include/xwin-config.h.in b/xorg-server/include/xwin-config.h.in index 13b51ca7f..8122f5543 100644 --- a/xorg-server/include/xwin-config.h.in +++ b/xorg-server/include/xwin-config.h.in @@ -20,9 +20,6 @@ /* Define to 1 if unsigned long is 64 bits. */ #undef _XSERVER64 -/* Do we require our own snprintf? */ -#undef NEED_SNPRINTF - /* Short vendor name */ #undef XVENDORNAMESHORT -- cgit v1.2.3