Update to xproto-7.0.9:

- add _X_LIKELY and _X_UNLIKELY (branch prediction)
- define _X_INLINE for older compilers

Add patches to handle reentrancy in X11/Xos_r.h better
by detecting via autoconf whether the interfaces are
actually present.

As this change is needed on various change for xproto to work
correctly, bump BUILDLINK_API_DEPENDS.

Take maintainership.

x11/xproto/Makefile

@@ -1,19 +1,23 @@
-# $NetBSD: Makefile,v 1.3 2006/10/13 13:45:23 reed Exp $
+# $NetBSD: Makefile,v 1.4 2006/11/03 17:03:04 joerg Exp $
 #
 
-DISTNAME=		xproto-7.0.8
+DISTNAME=		xproto-7.0.9
 CATEGORIES=		x11 devel
 MASTER_SITES=		http://xorg.freedesktop.org/releases/individual/proto/
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		reed@reedmedia.net
+MAINTAINER=		joerg@NetBSD.org
 HOMEPAGE=		http://xorg.freedesktop.org/
 COMMENT=		X protocol and ancillary headers from Xorg X11
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE+=	xproto.pc.in
 USE_LANGUAGES=		c
 
+post-extract:
+	${MV} ${WRKSRC}/Xos_r.h ${WRKSRC}/Xos_r.h.in
+
 .include "../../mk/bsd.pkg.mk"

x11/xproto/distinfo

@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.2 2006/10/13 13:45:23 reed Exp $
+$NetBSD: distinfo,v 1.3 2006/11/03 17:03:04 joerg Exp $
 
-SHA1 (xproto-7.0.8.tar.bz2) = f3b3a8d65dc0d96902871ac4bb749cbf809f13a0
-RMD160 (xproto-7.0.8.tar.bz2) = 97b697743048eb1dce2cb7bf6124d2467b9d9735
-Size (xproto-7.0.8.tar.bz2) = 141875 bytes
+SHA1 (xproto-7.0.9.tar.bz2) = 89f62bd846654377706446ec63b98050ce268f86
+RMD160 (xproto-7.0.9.tar.bz2) = 158260d12444514ace88d385160bf284e70f54d3
+Size (xproto-7.0.9.tar.bz2) = 141941 bytes
+SHA1 (patch-aa) = 48f8206f8da09c7cd15cab57a2057b74a43e8c77
+SHA1 (patch-ab) = 2a6972b8fb362359414508cba6c109e459decd91
+SHA1 (patch-ac) = 2bcfa0ab2bf4823e26f4c13255c940106801a96b

x11/xproto/patches/patch-aa

@@ -0,0 +1,81 @@
+$NetBSD: patch-aa,v 1.1 2006/11/03 17:03:04 joerg Exp $
+
+--- Xos_r.h.in.orig	2006-11-02 08:15:48.000000000 +0000
++++ Xos_r.h.in
+@@ -188,6 +188,13 @@ extern void XtProcessUnlock(
+ #  endif
+ # endif
+ 
++#undef _XOS_R_H_MTSAFE_DIRENTAPI
++#undef _XOS_R_H_MTSAFE_NETDBAPI
++#undef _XOS_R_H_MTSAFE_PWDAPI
++#undef _XOS_R_H_MTSAFE_UNISTDAPI
++#undef _XOS_R_H_MTSAFE_STRINGAPI
++#undef _XOS_R_H_MTSAFE_TIMEAPI
++#undef _XOS_R_H_MTSAFE_GRPAPI
+ #endif /* !defined WIN32 */
+ 
+ /*
+@@ -226,7 +233,7 @@ extern void XtProcessUnlock(
+ 
+ #if defined(X_INCLUDE_PWD_H) && !defined(_XOS_INCLUDED_PWD_H)
+ # include <pwd.h>
+-# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_PWDAPI)
++# if defined(_XOS_MTSAFE_PWAPI)
+ #  define XOS_USE_MTSAFE_PWDAPI 1
+ # endif
+ #endif
+@@ -410,7 +417,7 @@ typedef int _Xgetpwret;
+ #if defined(X_INCLUDE_NETDB_H) && !defined(_XOS_INCLUDED_NETDB_H) \
+     && !defined(WIN32)
+ # include <netdb.h>
+-# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_NETDBAPI)
++# if defined(_XOS_R_H_MTSAFE_NETDBAPI)
+ #  define XOS_USE_MTSAFE_NETDBAPI 1
+ # endif
+ #endif
+@@ -573,7 +580,7 @@ typedef int _Xgetservbynameparams; /* du
+ #   define dirent direct
+ #  endif
+ # endif
+-# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_DIRENTAPI)
++# if defined(_XOS_R_H_MTSAFE_DIRENTAPI)
+ #  define XOS_USE_MTSAFE_DIRENTAPI 1
+ # endif
+ #endif
+@@ -691,7 +698,7 @@ extern int _Preaddir_r(DIR *, struct dir
+ 
+ #if defined(X_INCLUDE_UNISTD_H) && !defined(_XOS_INCLUDED_UNISTD_H)
+ /* <unistd.h> already included by <X11/Xos.h> */
+-# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_UNISTDAPI)
++# if defined(_XOS_R_H__MTSAFE_UNISTDAPI)
+ #  define XOS_USE_MTSAFE_UNISTDAPI 1
+ # endif
+ #endif
+@@ -831,7 +838,7 @@ typedef struct {
+ 
+ #if defined(X_INCLUDE_STRING_H) && !defined(_XOS_INCLUDED_STRING_H)
+ /* <string.h> has already been included by <X11/Xos.h> */
+-# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_STRINGAPI)
++# if defined(_XOS_R_H_MTSAFE_STRINGAPI)
+ #  define XOS_USE_MTSAFE_STRINGAPI 1
+ # endif
+ #endif
+@@ -883,7 +890,7 @@ typedef char * _Xstrtokparams;
+ 
+ #if defined(X_INCLUDE_TIME_H) && !defined(_XOS_INCLUDED_TIME_H)
+ # include <time.h>
+-# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_TIMEAPI)
++# if defined(_XOS_R_H_MTSAFE_TIMEAPI)
+ #  define XOS_USE_MTSAFE_TIMEAPI 1
+ # endif
+ #endif
+@@ -1046,7 +1053,7 @@ typedef struct tm _Xltimeparams;
+ 
+ #if defined(X_INCLUDE_GRP_H) && !defined(_XOS_INCLUDED_GRP_H)
+ # include <grp.h>
+-# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_GRPAPI)
++# if defined(_XOS_R_H_MTSAFE_GRPAPI)
+ #  define XOS_USE_MTSAFE_GRPAPI 1
+ # endif
+ #endif

x11/xproto/patches/patch-ab

@@ -0,0 +1,28 @@
+$NetBSD: patch-ab,v 1.1 2006/11/03 17:03:04 joerg Exp $
+
+--- configure.ac.orig	2006-11-02 08:17:10.000000000 +0000
++++ configure.ac
+@@ -4,6 +4,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ 
+ AC_CONFIG_HEADER([do-not-use-config.h])
+ AC_CONFIG_HEADER([Xfuncproto.h])
++AC_CONFIG_HEADER([Xos_r.h])
+ 
+ AC_CANONICAL_HOST
+ 
+@@ -170,6 +171,15 @@ if test "x$WIDEPROTO" = xno; then
+ 	AC_DEFINE(NARROWPROTO, [], [Narrow prototypes])
+ fi
+ 
++# Handle Xos_r.h
++AC_CHECK_FUNC(readdir_r, [AC_DEFINE(_XOS_R_H_MTSAFE_DIRENTAPI,[],[Assume has readdir_r and friends from dirent.h])],)
++AC_CHECK_FUNC(getgrgid_r, [AC_DEFINE(_XOS_R_H_MTSAFE_GRPAPI,[],[Assume has getgrgid_r and friends from grp.h])],)
++AC_CHECK_FUNC(getpwuid_r, [AC_DEFINE(_XOS_R_H_MTSAFE_PWDAPI,[],[Assume has getpwuid_r and friends from pwd.h])],)
++AC_CHECK_FUNC(gethostbyname_r, [AC_DEFINE(_XOS_R_H_MTSAFE_NETBDAPI,[],[Assume has gethostbyname_r and friends from netdb.h])],)
++AC_CHECK_FUNC(strtok_r, [AC_DEFINE(_XOS_R_H_MTSAFE_STRINGAPI,[],[Assume has strtok_r from string.h])],)
++AC_CHECK_FUNC(gmtime_r, [AC_DEFINE(_XOS_R_H_MTSAFE_TIMEAPI,[],[Assume has gmtime_r and friends from time.h])],)
++AC_CHECK_FUNC(ttyname_r, [AC_DEFINE(_XOS_R_H_MTSAFE_UNISTDAPI,[],[Assume has ttyname_r and friends from unistd.h])],)
++
+ XORG_RELEASE_VERSION
+ 
+ AC_OUTPUT([Makefile

x11/xproto/patches/patch-ac

@@ -0,0 +1,765 @@
+$NetBSD: patch-ac,v 1.1 2006/11/03 17:03:04 joerg Exp $
+
+--- configure.orig	2006-11-02 08:19:09.000000000 +0000
++++ configure
+@@ -2161,6 +2161,8 @@ ac_config_headers="$ac_config_headers do
+ 
+ ac_config_headers="$ac_config_headers Xfuncproto.h"
+ 
++ac_config_headers="$ac_config_headers Xos_r.h"
++
+ 
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+@@ -3910,6 +3912,743 @@ _ACEOF
+ 
+ fi
+ 
++# Handle Xos_r.h
++{ echo "$as_me:$LINENO: checking for readdir_r" >&5
++echo $ECHO_N "checking for readdir_r... $ECHO_C" >&6; }
++if test "${ac_cv_func_readdir_r+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define readdir_r to an innocuous variant, in case <limits.h> declares readdir_r.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define readdir_r innocuous_readdir_r
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char readdir_r (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef readdir_r
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char readdir_r ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_readdir_r || defined __stub___readdir_r
++choke me
++#endif
++
++int
++main ()
++{
++return readdir_r ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_readdir_r=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_func_readdir_r=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_func_readdir_r" >&5
++echo "${ECHO_T}$ac_cv_func_readdir_r" >&6; }
++if test $ac_cv_func_readdir_r = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define _XOS_R_H_MTSAFE_DIRENTAPI
++_ACEOF
++
++fi
++
++{ echo "$as_me:$LINENO: checking for getgrgid_r" >&5
++echo $ECHO_N "checking for getgrgid_r... $ECHO_C" >&6; }
++if test "${ac_cv_func_getgrgid_r+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define getgrgid_r to an innocuous variant, in case <limits.h> declares getgrgid_r.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define getgrgid_r innocuous_getgrgid_r
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char getgrgid_r (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef getgrgid_r
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char getgrgid_r ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_getgrgid_r || defined __stub___getgrgid_r
++choke me
++#endif
++
++int
++main ()
++{
++return getgrgid_r ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getgrgid_r=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_func_getgrgid_r=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_func_getgrgid_r" >&5
++echo "${ECHO_T}$ac_cv_func_getgrgid_r" >&6; }
++if test $ac_cv_func_getgrgid_r = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define _XOS_R_H_MTSAFE_GRPAPI
++_ACEOF
++
++fi
++
++{ echo "$as_me:$LINENO: checking for getpwuid_r" >&5
++echo $ECHO_N "checking for getpwuid_r... $ECHO_C" >&6; }
++if test "${ac_cv_func_getpwuid_r+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define getpwuid_r to an innocuous variant, in case <limits.h> declares getpwuid_r.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define getpwuid_r innocuous_getpwuid_r
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char getpwuid_r (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef getpwuid_r
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char getpwuid_r ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_getpwuid_r || defined __stub___getpwuid_r
++choke me
++#endif
++
++int
++main ()
++{
++return getpwuid_r ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getpwuid_r=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_func_getpwuid_r=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_func_getpwuid_r" >&5
++echo "${ECHO_T}$ac_cv_func_getpwuid_r" >&6; }
++if test $ac_cv_func_getpwuid_r = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define _XOS_R_H_MTSAFE_PWDAPI
++_ACEOF
++
++fi
++
++{ echo "$as_me:$LINENO: checking for gethostbyname_r" >&5
++echo $ECHO_N "checking for gethostbyname_r... $ECHO_C" >&6; }
++if test "${ac_cv_func_gethostbyname_r+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define gethostbyname_r to an innocuous variant, in case <limits.h> declares gethostbyname_r.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define gethostbyname_r innocuous_gethostbyname_r
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char gethostbyname_r (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef gethostbyname_r
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char gethostbyname_r ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_gethostbyname_r || defined __stub___gethostbyname_r
++choke me
++#endif
++
++int
++main ()
++{
++return gethostbyname_r ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_gethostbyname_r=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_func_gethostbyname_r=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname_r" >&5
++echo "${ECHO_T}$ac_cv_func_gethostbyname_r" >&6; }
++if test $ac_cv_func_gethostbyname_r = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define _XOS_R_H_MTSAFE_NETBDAPI
++_ACEOF
++
++fi
++
++{ echo "$as_me:$LINENO: checking for strtok_r" >&5
++echo $ECHO_N "checking for strtok_r... $ECHO_C" >&6; }
++if test "${ac_cv_func_strtok_r+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define strtok_r to an innocuous variant, in case <limits.h> declares strtok_r.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define strtok_r innocuous_strtok_r
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char strtok_r (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef strtok_r
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char strtok_r ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_strtok_r || defined __stub___strtok_r
++choke me
++#endif
++
++int
++main ()
++{
++return strtok_r ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_strtok_r=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_func_strtok_r=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_func_strtok_r" >&5
++echo "${ECHO_T}$ac_cv_func_strtok_r" >&6; }
++if test $ac_cv_func_strtok_r = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define _XOS_R_H_MTSAFE_STRINGAPI
++_ACEOF
++
++fi
++
++{ echo "$as_me:$LINENO: checking for gmtime_r" >&5
++echo $ECHO_N "checking for gmtime_r... $ECHO_C" >&6; }
++if test "${ac_cv_func_gmtime_r+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define gmtime_r to an innocuous variant, in case <limits.h> declares gmtime_r.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define gmtime_r innocuous_gmtime_r
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char gmtime_r (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef gmtime_r
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char gmtime_r ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_gmtime_r || defined __stub___gmtime_r
++choke me
++#endif
++
++int
++main ()
++{
++return gmtime_r ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_gmtime_r=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_func_gmtime_r=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_func_gmtime_r" >&5
++echo "${ECHO_T}$ac_cv_func_gmtime_r" >&6; }
++if test $ac_cv_func_gmtime_r = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define _XOS_R_H_MTSAFE_TIMEAPI
++_ACEOF
++
++fi
++
++{ echo "$as_me:$LINENO: checking for ttyname_r" >&5
++echo $ECHO_N "checking for ttyname_r... $ECHO_C" >&6; }
++if test "${ac_cv_func_ttyname_r+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define ttyname_r to an innocuous variant, in case <limits.h> declares ttyname_r.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define ttyname_r innocuous_ttyname_r
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char ttyname_r (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef ttyname_r
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char ttyname_r ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_ttyname_r || defined __stub___ttyname_r
++choke me
++#endif
++
++int
++main ()
++{
++return ttyname_r ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_ttyname_r=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_func_ttyname_r=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ttyname_r" >&5
++echo "${ECHO_T}$ac_cv_func_ttyname_r" >&6; }
++if test $ac_cv_func_ttyname_r = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define _XOS_R_H_MTSAFE_UNISTDAPI
++_ACEOF
++
++fi
++
++
+ 
+ 
+ # Check whether --with-release-version was given.
+@@ -4494,6 +5233,7 @@ do
+   case $ac_config_target in
+     "do-not-use-config.h") CONFIG_HEADERS="$CONFIG_HEADERS do-not-use-config.h" ;;
+     "Xfuncproto.h") CONFIG_HEADERS="$CONFIG_HEADERS Xfuncproto.h" ;;
++    "Xos_r.h") CONFIG_HEADERS="$CONFIG_HEADERS Xos_r.h" ;;
+     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+     "Xpoll.h") CONFIG_FILES="$CONFIG_FILES Xpoll.h" ;;