gnutls-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] GNU gnutls branch, master, updated. gnutls_2_99_0-10-g6ceb3b0


From: Nikos Mavrogiannopoulos
Subject: [SCM] GNU gnutls branch, master, updated. gnutls_2_99_0-10-g6ceb3b0
Date: Sun, 10 Apr 2011 07:50:00 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=6ceb3b0e0836f08ede425fd58ff93f322b881636

The branch, master has been updated
       via  6ceb3b0e0836f08ede425fd58ff93f322b881636 (commit)
      from  e71edec2ab386f241da0e3bee034eab552d0c25e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6ceb3b0e0836f08ede425fd58ff93f322b881636
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Apr 10 09:49:44 2011 +0200

    Added gl/ files.

-----------------------------------------------------------------------

Summary of changes:
 gl/time.h                    |  564 ++++++++++++++++++++++++++++++++++++++++++
 gl/{unistd.in.h => unistd.h} |  564 ++++++++++++++++++++++++++++++++----------
 gl/warn-on-use.h             |   46 ++++
 gl/{wchar.in.h => wchar.h}   |  508 ++++++++++++++++++++++++++++++--------
 4 files changed, 1458 insertions(+), 224 deletions(-)
 create mode 100644 gl/time.h
 copy gl/{unistd.in.h => unistd.h} (74%)
 create mode 100644 gl/warn-on-use.h
 copy gl/{wchar.in.h => wchar.h} (67%)

diff --git a/gl/time.h b/gl/time.h
new file mode 100644
index 0000000..b4aaf35
--- /dev/null
+++ b/gl/time.h
@@ -0,0 +1,564 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* A more-standard <time.h>.
+
+   Copyright (C) 2007-2011 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+#ifdef __cplusplus
+# define restrict
+#endif
+
+/* Don't get in the way of glibc when it includes time.h merely to
+   declare a few standard symbols, rather than to declare all the
+   symbols.  Also, Solaris 8 <time.h> eventually includes itself
+   recursively; if that is happening, just include the system <time.h>
+   without adding our own declarations.  */
+#if (defined __need_time_t || defined __need_clock_t \
+     || defined __need_timespec \
+     || defined _GL_TIME_H)
+
+# include_next <time.h>
+
+#else
+
+# define _GL_TIME_H
+
+# include_next <time.h>
+
+/* NetBSD 5.0 mis-defines NULL.  */
+# include <stddef.h>
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+#ifndef _GL_CXXDEFS_H
+#define _GL_CXXDEFS_H
+
+/* The three most frequent use cases of these macros are:
+
+   * For providing a substitute for a function that is missing on some
+     platforms, but is declared and works fine on the platforms on which
+     it exists:
+
+       #if @GNULIB_FOO@
+       # if address@hidden@
+       _GL_FUNCDECL_SYS (foo, ...);
+       # endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on all platforms,
+     but is broken/insufficient and needs to be replaced on some platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on some platforms
+     but is broken/insufficient and needs to be replaced on some of them and
+     is additionally either missing or undeclared on some other platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       #  if address@hidden@   or   if address@hidden@
+       _GL_FUNCDECL_SYS (foo, ...);
+       #  endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+*/
+
+/* _GL_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#if defined __cplusplus
+# define _GL_EXTERN_C extern "C"
+#else
+# define _GL_EXTERN_C extern
+#endif
+
+/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes);
+   declares a replacement function, named rpl_func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Example:
+     _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...)
+                                  _GL_ARG_NONNULL ((1)));
+ */
+#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \
+  _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes)
+#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \
+  _GL_EXTERN_C rettype rpl_func parameters_and_attributes
+
+/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes);
+   declares the system function, named func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Example:
+     _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...)
+                                  _GL_ARG_NONNULL ((1)));
+ */
+#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \
+  _GL_EXTERN_C rettype func parameters_and_attributes
+
+/* _GL_CXXALIAS_RPL (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to rpl_func, if GNULIB_NAMESPACE is defined.
+   Example:
+     _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
+ */
+#define _GL_CXXALIAS_RPL(func,rettype,parameters) \
+  _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters)
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                \
+    {                                                         \
+      rettype (*const func) parameters = ::rpl_func;          \
+    }                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters);
+   is like  _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters);
+   except that the C function rpl_func may have a slightly different
+   declaration.  A cast is used to silence the "invalid conversion" error
+   that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                     \
+    {                                                              \
+      rettype (*const func) parameters =                           \
+        reinterpret_cast<rettype(*)parameters>(::rpl_func);        \
+    }                                                              \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to the system provided function func, if GNULIB_NAMESPACE
+   is defined.
+   Example:
+     _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
+ */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+  /* If we were to write
+       rettype (*const func) parameters = ::func;
+     like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls
+     better (remove an indirection through a 'static' pointer variable),
+     but then the _GL_CXXALIASWARN macro below would cause a warning not only
+     for uses of ::func but also for uses of GNULIB_NAMESPACE::func.  */
+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                     \
+    {                                              \
+      static rettype (*func) parameters = ::func;  \
+    }                                              \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function func may have a slightly different declaration.
+   A cast is used to silence the "invalid conversion" error that would
+   otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                          \
+    {                                                   \
+      static rettype (*func) parameters =               \
+        reinterpret_cast<rettype(*)parameters>(::func); \
+    }                                                   \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function is picked among a set of overloaded functions,
+   namely the one with rettype2 and parameters2.  Two consecutive casts
+   are used to silence the "cannot find a match" and "invalid conversion"
+   errors that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+  /* The outer cast must be a reinterpret_cast.
+     The inner cast: When the function is defined as a set of overloaded
+     functions, it works as a static_cast<>, choosing the designated variant.
+     When the function is defined as a single variant, it works as a
+     reinterpret_cast<>. The parenthesized cast syntax works both ways.  */
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    namespace GNULIB_NAMESPACE                                                \
+    {                                                                         \
+      static rettype (*func) parameters =                                     \
+        reinterpret_cast<rettype(*)parameters>(                               \
+          (rettype2(*)parameters2)(::func));                                  \
+    }                                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN (func);
+   causes a warning to be emitted when ::func is used but not when
+   GNULIB_NAMESPACE::func is used.  func must be defined without overloaded
+   variants.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN(func) \
+   _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN_1(func,namespace) \
+   _GL_CXXALIASWARN_2 (func, namespace)
+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
+   we enable the warning only when not optimizing.  */
+# if !__OPTIMIZE__
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+    _GL_WARN_ON_USE (func, \
+                     "The symbol ::" #func " refers to the system function. " \
+                     "Use " #namespace "::" #func " instead.")
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN(func) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes);
+   causes a warning to be emitted when the given overloaded variant of ::func
+   is used but not when GNULIB_NAMESPACE::func is used.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+   _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \
+                        GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) 
\
+   _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
+   we enable the warning only when not optimizing.  */
+# if !__OPTIMIZE__
+#  define 
_GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+    _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \
+                         "The symbol ::" #func " refers to the system 
function. " \
+                         "Use " #namespace "::" #func " instead.")
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+#  define 
_GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define 
_GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+#endif /* _GL_CXXDEFS_H */
+
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
+   that the values passed as arguments n, ..., m must be non-NULL pointers.
+   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
+#ifndef _GL_ARG_NONNULL
+# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
+#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
+# else
+#  define _GL_ARG_NONNULL(params)
+# endif
+#endif
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+#ifndef _GL_WARN_ON_USE
+
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+/* A compiler attribute is available in gcc versions 4.3.0 and later.  */
+#  define _GL_WARN_ON_USE(function, message) \
+extern __typeof__ (function) function __attribute__ ((__warning__ (message)))
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE(function, message) \
+extern __typeof__ (function) function
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+# endif
+#endif
+
+/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string")
+   is like _GL_WARN_ON_USE (function, "string"), except that the function is
+   declared with the given prototype, consisting of return type, parameters,
+   and attributes.
+   This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
+   not work in this case.  */
+#ifndef _GL_WARN_ON_USE_CXX
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes \
+     __attribute__ ((__warning__ (msg)))
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+# endif
+#endif
+
+/* _GL_WARN_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#ifndef _GL_WARN_EXTERN_C
+# if defined __cplusplus
+#  define _GL_WARN_EXTERN_C extern "C"
+# else
+#  define _GL_WARN_EXTERN_C extern
+# endif
+#endif
+
+/* Some systems don't define struct timespec (e.g., AIX 4.1, Ultrix 4.3).
+   Or they define it with the wrong member names or define it in <sys/time.h>
+   (e.g., FreeBSD circa 1997).  Stock Mingw does not define it, but the
+   pthreads-win32 library defines it in <pthread.h>.  */
+# if ! 1
+#  if 0
+#   include <sys/time.h>
+#  elif 0
+#   include <pthread.h>
+/* The pthreads-win32 <pthread.h> also defines a couple of broken macros.  */
+#   undef asctime_r
+#   undef ctime_r
+#   undef gmtime_r
+#   undef localtime_r
+#   undef rand_r
+#   undef strtok_r
+#  else
+
+#   ifdef __cplusplus
+extern "C" {
+#   endif
+
+#   if !GNULIB_defined_struct_timespec
+#    undef timespec
+#    define timespec rpl_timespec
+struct timespec
+{
+  time_t tv_sec;
+  long int tv_nsec;
+};
+#    define GNULIB_defined_struct_timespec 1
+#   endif
+
+#   ifdef __cplusplus
+}
+#   endif
+
+#  endif
+# endif
+
+# if !GNULIB_defined_struct_time_t_must_be_integral
+/* Per http://austingroupbugs.net/view.php?id=327, POSIX requires
+   time_t to be an integer type, even though C99 permits floating
+   point.  We don't know of any implementation that uses floating
+   point, and it is much easier to write code that doesn't have to
+   worry about that corner case, so we force the issue.  */
+struct __time_t_must_be_integral {
+  unsigned int __floating_time_t_unsupported : (time_t) 1;
+};
+#  define GNULIB_defined_struct_time_t_must_be_integral 1
+# endif
+
+/* Sleep for at least RQTP seconds unless interrupted,  If interrupted,
+   return -1 and store the remaining time into RMTP.  See
+   <http://www.opengroup.org/susv3xsh/nanosleep.html>.  */
+# if 0
+#  if GNULIB_PORTCHECK
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    define nanosleep rpl_nanosleep
+#   endif
+_GL_FUNCDECL_RPL (nanosleep, int,
+                  (struct timespec const *__rqtp, struct timespec *__rmtp)
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (nanosleep, int,
+                  (struct timespec const *__rqtp, struct timespec *__rmtp));
+#  else
+#   if ! 1
+_GL_FUNCDECL_SYS (nanosleep, int,
+                  (struct timespec const *__rqtp, struct timespec *__rmtp)
+                  _GL_ARG_NONNULL ((1)));
+#   endif
+_GL_CXXALIAS_SYS (nanosleep, int,
+                  (struct timespec const *__rqtp, struct timespec *__rmtp));
+#  endif
+_GL_CXXALIASWARN (nanosleep);
+# endif
+
+/* Return the 'time_t' representation of TP and normalize TP.  */
+# if 0
+#  if GNULIB_PORTCHECK
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    define mktime rpl_mktime
+#   endif
+_GL_FUNCDECL_RPL (mktime, time_t, (struct tm *__tp) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (mktime, time_t, (struct tm *__tp));
+#  else
+_GL_CXXALIAS_SYS (mktime, time_t, (struct tm *__tp));
+#  endif
+_GL_CXXALIASWARN (mktime);
+# endif
+
+/* Convert TIMER to RESULT, assuming local time and UTC respectively.  See
+   <http://www.opengroup.org/susv3xsh/localtime_r.html> and
+   <http://www.opengroup.org/susv3xsh/gmtime_r.html>.  */
+# if 1
+#  if 0
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef localtime_r
+#    define localtime_r rpl_localtime_r
+#   endif
+_GL_FUNCDECL_RPL (localtime_r, struct tm *, (time_t const *restrict __timer,
+                                             struct tm *restrict __result)
+                                            _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (localtime_r, struct tm *, (time_t const *restrict __timer,
+                                             struct tm *restrict __result));
+#  else
+#   if ! 0
+_GL_FUNCDECL_SYS (localtime_r, struct tm *, (time_t const *restrict __timer,
+                                             struct tm *restrict __result)
+                                            _GL_ARG_NONNULL ((1, 2)));
+#   endif
+_GL_CXXALIAS_SYS (localtime_r, struct tm *, (time_t const *restrict __timer,
+                                             struct tm *restrict __result));
+#  endif
+#  if 0
+_GL_CXXALIASWARN (localtime_r);
+#  endif
+#  if 0
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef gmtime_r
+#    define gmtime_r rpl_gmtime_r
+#   endif
+_GL_FUNCDECL_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer,
+                                          struct tm *restrict __result)
+                                         _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer,
+                                          struct tm *restrict __result));
+#  else
+#   if ! 0
+_GL_FUNCDECL_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer,
+                                          struct tm *restrict __result)
+                                         _GL_ARG_NONNULL ((1, 2)));
+#   endif
+_GL_CXXALIAS_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer,
+                                          struct tm *restrict __result));
+#  endif
+#  if 0
+_GL_CXXALIASWARN (gmtime_r);
+#  endif
+# endif
+
+/* Parse BUF as a time stamp, assuming FORMAT specifies its layout, and store
+   the resulting broken-down time into TM.  See
+   <http://www.opengroup.org/susv3xsh/strptime.html>.  */
+# if 0
+#  if ! 1
+_GL_FUNCDECL_SYS (strptime, char *, (char const *restrict __buf,
+                                     char const *restrict __format,
+                                     struct tm *restrict __tm)
+                                    _GL_ARG_NONNULL ((1, 2, 3)));
+#  endif
+_GL_CXXALIAS_SYS (strptime, char *, (char const *restrict __buf,
+                                     char const *restrict __format,
+                                     struct tm *restrict __tm));
+_GL_CXXALIASWARN (strptime);
+# endif
+
+/* Convert TM to a time_t value, assuming UTC.  */
+# if 0
+#  if GNULIB_PORTCHECK
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef timegm
+#    define timegm rpl_timegm
+#   endif
+_GL_FUNCDECL_RPL (timegm, time_t, (struct tm *__tm) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (timegm, time_t, (struct tm *__tm));
+#  else
+#   if ! 1
+_GL_FUNCDECL_SYS (timegm, time_t, (struct tm *__tm) _GL_ARG_NONNULL ((1)));
+#   endif
+_GL_CXXALIAS_SYS (timegm, time_t, (struct tm *__tm));
+#  endif
+_GL_CXXALIASWARN (timegm);
+# endif
+
+/* Encourage applications to avoid unsafe functions that can overrun
+   buffers when given outlandish struct tm values.  Portable
+   applications should use strftime (or even sprintf) instead.  */
+# if defined GNULIB_POSIXCHECK
+#  undef asctime
+_GL_WARN_ON_USE (asctime, "asctime can overrun buffers in some cases - "
+                 "better use strftime (or even sprintf) instead");
+# endif
+# if defined GNULIB_POSIXCHECK
+#  undef asctime_r
+_GL_WARN_ON_USE (asctime, "asctime_r can overrun buffers in some cases - "
+                 "better use strftime (or even sprintf) instead");
+# endif
+# if defined GNULIB_POSIXCHECK
+#  undef ctime
+_GL_WARN_ON_USE (asctime, "ctime can overrun buffers in some cases - "
+                 "better use strftime (or even sprintf) instead");
+# endif
+# if defined GNULIB_POSIXCHECK
+#  undef ctime_r
+_GL_WARN_ON_USE (asctime, "ctime_r can overrun buffers in some cases - "
+                 "better use strftime (or even sprintf) instead");
+# endif
+
+#endif
diff --git a/gl/unistd.in.h b/gl/unistd.h
similarity index 74%
copy from gl/unistd.in.h
copy to gl/unistd.h
index 15893d7..60bca6f 100644
--- a/gl/unistd.in.h
+++ b/gl/unistd.h
@@ -1,3 +1,4 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Substitute for and wrapper around <unistd.h>.
    Copyright (C) 2003-2011 Free Software Foundation, Inc.
 
@@ -16,20 +17,20 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if __GNUC__ >= 3
address@hidden@
+#pragma GCC system_header
 #endif
address@hidden@
+
 
 /* Special invocation convention:
    - On mingw, several headers, including <winsock2.h>, include <unistd.h>,
      but we need to ensure that both the system <unistd.h> and <winsock2.h>
      are completely included before we replace gethostname.  */
-#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
+#if 0 && 0 \
   && !defined _GL_WINSOCK2_H_WITNESS && defined _WINSOCK2_H
 /* <unistd.h> is being indirectly included for the first time from
    <winsock2.h>; avoid declaring any overrides.  */
-# if @HAVE_UNISTD_H@
-#  @INCLUDE_NEXT@ @NEXT_UNISTD_H@
+# if 1
+#  include_next <unistd.h>
 # else
 #  error unexpected; report this to address@hidden
 # endif
@@ -39,12 +40,12 @@
 #elif !defined _GL_UNISTD_H
 
 /* The include_next requires a split double-inclusion guard.  */
-#if @HAVE_UNISTD_H@
-# @INCLUDE_NEXT@ @NEXT_UNISTD_H@
+#if 1
+# include_next <unistd.h>
 #endif
 
 /* Get all possible declarations of gethostname().  */
-#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
+#if 0 && 0 \
   && !defined _GL_INCLUDING_WINSOCK2_H
 # define _GL_INCLUDING_WINSOCK2_H
 # include <winsock2.h>
@@ -61,7 +62,7 @@
 /* Cygwin 1.7.1 declares symlinkat in <stdio.h>, not in <unistd.h>.  */
 /* But avoid namespace pollution on glibc systems.  */
 #if (!(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET) \
-     || ((@GNULIB_SYMLINKAT@ || defined GNULIB_POSIXCHECK) \
+     || ((0 || defined GNULIB_POSIXCHECK) \
          && defined __CYGWIN__)) \
     && ! defined __GLIBC__
 # include <stdio.h>
@@ -69,7 +70,7 @@
 
 /* Cygwin 1.7.1 declares unlinkat in <fcntl.h>, not in <unistd.h>.  */
 /* But avoid namespace pollution on glibc systems.  */
-#if (@GNULIB_UNLINKAT@ || defined GNULIB_POSIXCHECK) && defined __CYGWIN__ \
+#if (0 || defined GNULIB_POSIXCHECK) && defined __CYGWIN__ \
     && ! defined __GLIBC__
 # include <fcntl.h>
 #endif
@@ -83,7 +84,7 @@
 #endif
 
 /* mingw declares getcwd in <io.h>, not in <unistd.h>.  */
-#if ((@GNULIB_GETCWD@ || defined GNULIB_POSIXCHECK) \
+#if ((0 || defined GNULIB_POSIXCHECK) \
      && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
 # include <io.h>
 #endif
@@ -91,34 +92,345 @@
 /* AIX and OSF/1 5.1 declare getdomainname in <netdb.h>, not in <unistd.h>.
    NonStop Kernel declares gethostname in <netdb.h>, not in <unistd.h>.  */
 /* But avoid namespace pollution on glibc systems.  */
-#if ((@GNULIB_GETDOMAINNAME@ && (defined _AIX || defined __osf__)) \
-     || (@GNULIB_GETHOSTNAME@ && defined __TANDEM)) \
+#if ((0 && (defined _AIX || defined __osf__)) \
+     || (0 && defined __TANDEM)) \
     && !defined __GLIBC__
 # include <netdb.h>
 #endif
 
-#if (@GNULIB_WRITE@ || @GNULIB_READLINK@ || @GNULIB_READLINKAT@ \
-     || @GNULIB_PREAD@ || @GNULIB_PWRITE@ || defined GNULIB_POSIXCHECK)
+#if (0 || 0 || 0 \
+     || 0 || 0 || defined GNULIB_POSIXCHECK)
 /* Get ssize_t.  */
 # include <sys/types.h>
 #endif
 
 /* Get getopt(), optarg, optind, opterr, optopt.
    But avoid namespace pollution on glibc systems.  */
-#if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined 
_GL_SYSTEM_GETOPT
+#if 0 && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT
 # include <getopt.h>
 #endif
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+#ifndef _GL_CXXDEFS_H
+#define _GL_CXXDEFS_H
+
+/* The three most frequent use cases of these macros are:
+
+   * For providing a substitute for a function that is missing on some
+     platforms, but is declared and works fine on the platforms on which
+     it exists:
+
+       #if @GNULIB_FOO@
+       # if address@hidden@
+       _GL_FUNCDECL_SYS (foo, ...);
+       # endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on all platforms,
+     but is broken/insufficient and needs to be replaced on some platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on some platforms
+     but is broken/insufficient and needs to be replaced on some of them and
+     is additionally either missing or undeclared on some other platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       #  if address@hidden@   or   if address@hidden@
+       _GL_FUNCDECL_SYS (foo, ...);
+       #  endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+*/
+
+/* _GL_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#if defined __cplusplus
+# define _GL_EXTERN_C extern "C"
+#else
+# define _GL_EXTERN_C extern
+#endif
+
+/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes);
+   declares a replacement function, named rpl_func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Example:
+     _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...)
+                                  _GL_ARG_NONNULL ((1)));
+ */
+#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \
+  _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes)
+#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \
+  _GL_EXTERN_C rettype rpl_func parameters_and_attributes
+
+/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes);
+   declares the system function, named func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Example:
+     _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...)
+                                  _GL_ARG_NONNULL ((1)));
+ */
+#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \
+  _GL_EXTERN_C rettype func parameters_and_attributes
+
+/* _GL_CXXALIAS_RPL (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to rpl_func, if GNULIB_NAMESPACE is defined.
+   Example:
+     _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
+ */
+#define _GL_CXXALIAS_RPL(func,rettype,parameters) \
+  _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters)
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                \
+    {                                                         \
+      rettype (*const func) parameters = ::rpl_func;          \
+    }                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters);
+   is like  _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters);
+   except that the C function rpl_func may have a slightly different
+   declaration.  A cast is used to silence the "invalid conversion" error
+   that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                     \
+    {                                                              \
+      rettype (*const func) parameters =                           \
+        reinterpret_cast<rettype(*)parameters>(::rpl_func);        \
+    }                                                              \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to the system provided function func, if GNULIB_NAMESPACE
+   is defined.
+   Example:
+     _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
+ */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+  /* If we were to write
+       rettype (*const func) parameters = ::func;
+     like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls
+     better (remove an indirection through a 'static' pointer variable),
+     but then the _GL_CXXALIASWARN macro below would cause a warning not only
+     for uses of ::func but also for uses of GNULIB_NAMESPACE::func.  */
+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                     \
+    {                                              \
+      static rettype (*func) parameters = ::func;  \
+    }                                              \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function func may have a slightly different declaration.
+   A cast is used to silence the "invalid conversion" error that would
+   otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                          \
+    {                                                   \
+      static rettype (*func) parameters =               \
+        reinterpret_cast<rettype(*)parameters>(::func); \
+    }                                                   \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function is picked among a set of overloaded functions,
+   namely the one with rettype2 and parameters2.  Two consecutive casts
+   are used to silence the "cannot find a match" and "invalid conversion"
+   errors that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+  /* The outer cast must be a reinterpret_cast.
+     The inner cast: When the function is defined as a set of overloaded
+     functions, it works as a static_cast<>, choosing the designated variant.
+     When the function is defined as a single variant, it works as a
+     reinterpret_cast<>. The parenthesized cast syntax works both ways.  */
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    namespace GNULIB_NAMESPACE                                                \
+    {                                                                         \
+      static rettype (*func) parameters =                                     \
+        reinterpret_cast<rettype(*)parameters>(                               \
+          (rettype2(*)parameters2)(::func));                                  \
+    }                                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN (func);
+   causes a warning to be emitted when ::func is used but not when
+   GNULIB_NAMESPACE::func is used.  func must be defined without overloaded
+   variants.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN(func) \
+   _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN_1(func,namespace) \
+   _GL_CXXALIASWARN_2 (func, namespace)
+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
+   we enable the warning only when not optimizing.  */
+# if !__OPTIMIZE__
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+    _GL_WARN_ON_USE (func, \
+                     "The symbol ::" #func " refers to the system function. " \
+                     "Use " #namespace "::" #func " instead.")
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN(func) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes);
+   causes a warning to be emitted when the given overloaded variant of ::func
+   is used but not when GNULIB_NAMESPACE::func is used.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+   _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \
+                        GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) 
\
+   _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
+   we enable the warning only when not optimizing.  */
+# if !__OPTIMIZE__
+#  define 
_GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+    _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \
+                         "The symbol ::" #func " refers to the system 
function. " \
+                         "Use " #namespace "::" #func " instead.")
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+#  define 
_GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define 
_GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+#endif /* _GL_CXXDEFS_H */
 
 /* The definition of _GL_ARG_NONNULL is copied here.  */
+/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
+   that the values passed as arguments n, ..., m must be non-NULL pointers.
+   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
+#ifndef _GL_ARG_NONNULL
+# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
+#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
+# else
+#  define _GL_ARG_NONNULL(params)
+# endif
+#endif
 
 /* The definition of _GL_WARN_ON_USE is copied here.  */
+#ifndef _GL_WARN_ON_USE
+
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+/* A compiler attribute is available in gcc versions 4.3.0 and later.  */
+#  define _GL_WARN_ON_USE(function, message) \
+extern __typeof__ (function) function __attribute__ ((__warning__ (message)))
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE(function, message) \
+extern __typeof__ (function) function
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+# endif
+#endif
+
+/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string")
+   is like _GL_WARN_ON_USE (function, "string"), except that the function is
+   declared with the given prototype, consisting of return type, parameters,
+   and attributes.
+   This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
+   not work in this case.  */
+#ifndef _GL_WARN_ON_USE_CXX
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes \
+     __attribute__ ((__warning__ (msg)))
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+# endif
+#endif
+
+/* _GL_WARN_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#ifndef _GL_WARN_EXTERN_C
+# if defined __cplusplus
+#  define _GL_WARN_EXTERN_C extern "C"
+# else
+#  define _GL_WARN_EXTERN_C extern
+# endif
+#endif
 
 
-#if @GNULIB_GETHOSTNAME@
+#if 0
 /* Get all possible declarations of gethostname().  */
-# if @UNISTD_H_HAVE_WINSOCK2_H@
+# if 0
 #  if !defined _GL_SYS_SOCKET_H
 #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #    undef socket
@@ -223,13 +535,13 @@ _GL_WARN_ON_USE (access, "the access function is a 
security risk - "
 #endif
 
 
-#if @GNULIB_CHOWN@
+#if 0
 /* Change the owner of FILE to UID (if UID is not -1) and the group of FILE
    to GID (if GID is not -1).  Follow symbolic links.
    Return 0 if successful, otherwise -1 and errno set.
    See the POSIX:2001 specification
    <http://www.opengroup.org/susv3xsh/chown.html>.  */
-# if @REPLACE_CHOWN@
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef chown
 #   define chown rpl_chown
@@ -238,7 +550,7 @@ _GL_FUNCDECL_RPL (chown, int, (const char *file, uid_t uid, 
gid_t gid)
                               _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (chown, int, (const char *file, uid_t uid, gid_t gid));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (chown, int, (const char *file, uid_t uid, gid_t gid)
                               _GL_ARG_NONNULL ((1)));
 #  endif
@@ -255,8 +567,8 @@ _GL_WARN_ON_USE (chown, "chown fails to follow symlinks on 
some systems and "
 #endif
 
 
-#if @GNULIB_CLOSE@
-# if @REPLACE_CLOSE@
+#if 0
+# if 0
 /* Automatically included by modules that need a replacement for close.  */
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef close
@@ -268,7 +580,7 @@ _GL_CXXALIAS_RPL (close, int, (int fd));
 _GL_CXXALIAS_SYS (close, int, (int fd));
 # endif
 _GL_CXXALIASWARN (close);
-#elif @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
+#elif 0
 # undef close
 # define close close_used_without_requesting_gnulib_module_close
 #elif defined GNULIB_POSIXCHECK
@@ -279,7 +591,7 @@ _GL_WARN_ON_USE (close, "close does not portably work on 
sockets - "
 #endif
 
 
-#if @REPLACE_DUP@
+#if 0
 # if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #  define dup rpl_dup
 # endif
@@ -291,20 +603,20 @@ _GL_CXXALIAS_SYS (dup, int, (int oldfd));
 _GL_CXXALIASWARN (dup);
 
 
-#if @GNULIB_DUP2@
+#if 0
 /* Copy the file descriptor OLDFD into file descriptor NEWFD.  Do nothing if
    NEWFD = OLDFD, otherwise close NEWFD first if it is open.
    Return newfd if successful, otherwise -1 and errno set.
    See the POSIX:2001 specification
    <http://www.opengroup.org/susv3xsh/dup2.html>.  */
-# if @REPLACE_DUP2@
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define dup2 rpl_dup2
 #  endif
 _GL_FUNCDECL_RPL (dup2, int, (int oldfd, int newfd));
 _GL_CXXALIAS_RPL (dup2, int, (int oldfd, int newfd));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (dup2, int, (int oldfd, int newfd));
 #  endif
 _GL_CXXALIAS_SYS (dup2, int, (int oldfd, int newfd));
@@ -319,7 +631,7 @@ _GL_WARN_ON_USE (dup2, "dup2 is unportable - "
 #endif
 
 
-#if @GNULIB_DUP3@
+#if 0
 /* Copy the file descriptor OLDFD into file descriptor NEWFD, with the
    specified flags.
    The flags are a bitmask, possibly including O_CLOEXEC (defined in <fcntl.h>)
@@ -328,7 +640,7 @@ _GL_WARN_ON_USE (dup2, "dup2 is unportable - "
    Return newfd if successful, otherwise -1 and errno set.
    See the Linux man page at
    <http://www.kernel.org/doc/man-pages/online/pages/man2/dup3.2.html>.  */
-# if @HAVE_DUP3@
+# if 1
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define dup3 rpl_dup3
 #  endif
@@ -348,8 +660,8 @@ _GL_WARN_ON_USE (dup3, "dup3 is unportable - "
 #endif
 
 
-#if @GNULIB_ENVIRON@
-# if address@hidden@
+#if 0
+# if !1
 /* Set of environment variables and values.  An array of strings of the form
    "VARIABLE=VALUE", terminated with a NULL.  */
 #  if defined __APPLE__ && defined __MACH__
@@ -380,10 +692,10 @@ _GL_WARN_ON_USE (rpl_environ, "environ is unportable - "
 #endif
 
 
-#if @GNULIB_EUIDACCESS@
+#if 0
 /* Like access(), except that it uses the effective user id and group id of
    the current process.  */
-# if address@hidden@
+# if !1
 _GL_FUNCDECL_SYS (euidaccess, int, (const char *filename, int mode)
                                    _GL_ARG_NONNULL ((1)));
 # endif
@@ -403,8 +715,8 @@ _GL_WARN_ON_USE (euidaccess, "euidaccess is unportable - "
 #endif
 
 
-#if @GNULIB_FACCESSAT@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (faccessat, int,
                   (int fd, char const *file, int mode, int flag)
                   _GL_ARG_NONNULL ((2)));
@@ -421,13 +733,13 @@ _GL_WARN_ON_USE (faccessat, "faccessat is not portable - "
 #endif
 
 
-#if @GNULIB_FCHDIR@
+#if 0
 /* Change the process' current working directory to the directory on which
    the given file descriptor is open.
    Return 0 if successful, otherwise -1 and errno set.
    See the POSIX:2001 specification
    <http://www.opengroup.org/susv3xsh/fchdir.html>.  */
-# if ! @HAVE_FCHDIR@
+# if ! 1
 _GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/));
 
 /* Gnulib internal hooks needed to maintain the fchdir metadata.  */
@@ -438,7 +750,7 @@ _GL_EXTERN_C int _gl_register_dup (int oldfd, int newfd);
 _GL_EXTERN_C const char *_gl_directory_name (int fd);
 
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/));
 #  endif
 # endif
@@ -453,8 +765,8 @@ _GL_WARN_ON_USE (fchdir, "fchdir is unportable - "
 #endif
 
 
-#if @GNULIB_FCHOWNAT@
-# if @REPLACE_FCHOWNAT@
+#if 0
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef fchownat
 #   define fchownat rpl_fchownat
@@ -465,7 +777,7 @@ _GL_FUNCDECL_RPL (fchownat, int, (int fd, char const *file,
 _GL_CXXALIAS_RPL (fchownat, int, (int fd, char const *file,
                                   uid_t owner, gid_t group, int flag));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (fchownat, int, (int fd, char const *file,
                                   uid_t owner, gid_t group, int flag)
                                  _GL_ARG_NONNULL ((2)));
@@ -483,12 +795,12 @@ _GL_WARN_ON_USE (fchownat, "fchownat is not portable - "
 #endif
 
 
-#if @GNULIB_FSYNC@
+#if 0
 /* Synchronize changes to a file.
    Return 0 if successful, otherwise -1 and errno set.
    See POSIX:2001 specification
    <http://www.opengroup.org/susv3xsh/fsync.html>.  */
-# if address@hidden@
+# if !1
 _GL_FUNCDECL_SYS (fsync, int, (int fd));
 # endif
 _GL_CXXALIAS_SYS (fsync, int, (int fd));
@@ -502,12 +814,12 @@ _GL_WARN_ON_USE (fsync, "fsync is unportable - "
 #endif
 
 
-#if @GNULIB_FTRUNCATE@
+#if 0
 /* Change the size of the file to which FD is opened to become equal to LENGTH.
    Return 0 if successful, otherwise -1 and errno set.
    See the POSIX:2001 specification
    <http://www.opengroup.org/susv3xsh/ftruncate.html>.  */
-# if address@hidden@
+# if !1
 _GL_FUNCDECL_SYS (ftruncate, int, (int fd, off_t length));
 # endif
 _GL_CXXALIAS_SYS (ftruncate, int, (int fd, off_t length));
@@ -521,7 +833,7 @@ _GL_WARN_ON_USE (ftruncate, "ftruncate is unportable - "
 #endif
 
 
-#if @GNULIB_GETCWD@
+#if 0
 /* Get the name of the current working directory, and put it in SIZE bytes
    of BUF.
    Return BUF if successful, or NULL if the directory couldn't be determined
@@ -532,7 +844,7 @@ _GL_WARN_ON_USE (ftruncate, "ftruncate is unportable - "
    extension: If BUF is NULL, an array is allocated with 'malloc'; the array
    is SIZE bytes long, unless SIZE == 0, in which case it is as big as
    necessary.  */
-# if @REPLACE_GETCWD@
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define getcwd rpl_getcwd
 #  endif
@@ -553,7 +865,7 @@ _GL_WARN_ON_USE (getcwd, "getcwd is unportable - "
 #endif
 
 
-#if @GNULIB_GETDOMAINNAME@
+#if 0
 /* Return the NIS domain name of the machine.
    WARNING! The NIS domain name is unrelated to the fully qualified host name
             of the machine.  It is also unrelated to email addresses.
@@ -564,7 +876,7 @@ _GL_WARN_ON_USE (getcwd, "getcwd is unportable - "
    Null terminate it if the name is shorter than LEN.
    If the NIS domain name is longer than LEN, set errno = EINVAL and return -1.
    Return 0 if successful, otherwise set errno and return -1.  */
-# if @REPLACE_GETDOMAINNAME@
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef getdomainname
 #   define getdomainname rpl_getdomainname
@@ -573,7 +885,7 @@ _GL_FUNCDECL_RPL (getdomainname, int, (char *name, size_t 
len)
                                       _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (getdomainname, int, (char *name, size_t len));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (getdomainname, int, (char *name, size_t len)
                                       _GL_ARG_NONNULL ((1)));
 #  endif
@@ -589,10 +901,10 @@ _GL_WARN_ON_USE (getdomainname, "getdomainname is 
unportable - "
 #endif
 
 
-#if @GNULIB_GETDTABLESIZE@
+#if 0
 /* Return the maximum number of file descriptors in the current process.
    In POSIX, this is same as sysconf (_SC_OPEN_MAX).  */
-# if address@hidden@
+# if !1
 _GL_FUNCDECL_SYS (getdtablesize, int, (void));
 # endif
 _GL_CXXALIAS_SYS (getdtablesize, int, (void));
@@ -606,13 +918,13 @@ _GL_WARN_ON_USE (getdtablesize, "getdtablesize is 
unportable - "
 #endif
 
 
-#if @GNULIB_GETGROUPS@
+#if 0
 /* Return the supplemental groups that the current process belongs to.
    It is unspecified whether the effective group id is in the list.
    If N is 0, return the group count; otherwise, N describes how many
    entries are available in GROUPS.  Return -1 and set errno if N is
    not 0 and not large enough.  Fails with ENOSYS on some systems.  */
-# if @REPLACE_GETGROUPS@
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef getgroups
 #   define getgroups rpl_getgroups
@@ -620,7 +932,7 @@ _GL_WARN_ON_USE (getdtablesize, "getdtablesize is 
unportable - "
 _GL_FUNCDECL_RPL (getgroups, int, (int n, gid_t *groups));
 _GL_CXXALIAS_RPL (getgroups, int, (int n, gid_t *groups));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (getgroups, int, (int n, gid_t *groups));
 #  endif
 _GL_CXXALIAS_SYS (getgroups, int, (int n, gid_t *groups));
@@ -635,7 +947,7 @@ _GL_WARN_ON_USE (getgroups, "getgroups is unportable - "
 #endif
 
 
-#if @GNULIB_GETHOSTNAME@
+#if 0
 /* Return the standard host name of the machine.
    WARNING! The host name may or may not be fully qualified.
 
@@ -643,7 +955,7 @@ _GL_WARN_ON_USE (getgroups, "getgroups is unportable - "
    Null terminate it if the name is shorter than LEN.
    If the host name is longer than LEN, set errno = EINVAL and return -1.
    Return 0 if successful, otherwise set errno and return -1.  */
-# if @UNISTD_H_HAVE_WINSOCK2_H@
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef gethostname
 #   define gethostname rpl_gethostname
@@ -652,7 +964,7 @@ _GL_FUNCDECL_RPL (gethostname, int, (char *name, size_t len)
                                     _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (gethostname, int, (char *name, size_t len));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (gethostname, int, (char *name, size_t len)
                                     _GL_ARG_NONNULL ((1)));
 #  endif
@@ -662,7 +974,7 @@ _GL_FUNCDECL_SYS (gethostname, int, (char *name, size_t len)
 _GL_CXXALIAS_SYS_CAST (gethostname, int, (char *name, size_t len));
 # endif
 _GL_CXXALIASWARN (gethostname);
-#elif @UNISTD_H_HAVE_WINSOCK2_H@
+#elif 0
 # undef gethostname
 # define gethostname 
gethostname_used_without_requesting_gnulib_module_gethostname
 #elif defined GNULIB_POSIXCHECK
@@ -674,7 +986,7 @@ _GL_WARN_ON_USE (gethostname, "gethostname is unportable - "
 #endif
 
 
-#if @GNULIB_GETLOGIN@
+#if 0
 /* Returns the user's login name, or NULL if it cannot be found.  Upon error,
    returns NULL with errno set.
 
@@ -685,7 +997,7 @@ _GL_WARN_ON_USE (gethostname, "gethostname is unportable - "
      ${LOGNAME-$USER}        on Unix platforms,
      $USERNAME               on native Windows platforms.
  */
-# if address@hidden@
+# if !1
 _GL_FUNCDECL_SYS (getlogin, char *, (void));
 # endif
 _GL_CXXALIAS_SYS (getlogin, char *, (void));
@@ -699,7 +1011,7 @@ _GL_WARN_ON_USE (getlogin, "getlogin is unportable - "
 #endif
 
 
-#if @GNULIB_GETLOGIN_R@
+#if 0
 /* Copies the user's login name to NAME.
    The array pointed to by NAME has room for SIZE bytes.
 
@@ -714,7 +1026,7 @@ _GL_WARN_ON_USE (getlogin, "getlogin is unportable - "
      ${LOGNAME-$USER}        on Unix platforms,
      $USERNAME               on native Windows platforms.
  */
-# if @REPLACE_GETLOGIN_R@
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define getlogin_r rpl_getlogin_r
 #  endif
@@ -722,7 +1034,7 @@ _GL_FUNCDECL_RPL (getlogin_r, int, (char *name, size_t 
size)
                                    _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (getlogin_r, int, (char *name, size_t size));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (getlogin_r, int, (char *name, size_t size)
                                    _GL_ARG_NONNULL ((1)));
 #  endif
@@ -740,15 +1052,15 @@ _GL_WARN_ON_USE (getlogin_r, "getlogin_r is unportable - 
"
 #endif
 
 
-#if @GNULIB_GETPAGESIZE@
-# if @REPLACE_GETPAGESIZE@
+#if IN_GNUTLS_GNULIB_TESTS
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define getpagesize rpl_getpagesize
 #  endif
 _GL_FUNCDECL_RPL (getpagesize, int, (void));
 _GL_CXXALIAS_RPL (getpagesize, int, (void));
 # else
-#  if address@hidden@
+#  if !1
 #   if !defined getpagesize
 /* This is for POSIX systems.  */
 #    if !defined _gl_getpagesize && defined _SC_PAGESIZE
@@ -765,7 +1077,7 @@ _GL_CXXALIAS_RPL (getpagesize, int, (void));
 #     endif
 #    endif
 /* This is for BeOS.  */
-#    if !defined _gl_getpagesize && @HAVE_OS_H@
+#    if !defined _gl_getpagesize && 0
 #     include <OS.h>
 #     if defined B_PAGE_SIZE
 #      define _gl_getpagesize() B_PAGE_SIZE
@@ -776,7 +1088,7 @@ _GL_CXXALIAS_RPL (getpagesize, int, (void));
 #     define _gl_getpagesize() 2048
 #    endif
 /* This is for older Unix systems.  */
-#    if !defined _gl_getpagesize && @HAVE_SYS_PARAM_H@
+#    if !defined _gl_getpagesize && 0
 #     include <sys/param.h>
 #     ifdef EXEC_PAGESIZE
 #      define _gl_getpagesize() EXEC_PAGESIZE
@@ -810,7 +1122,7 @@ getpagesize ()
 /* Need to cast, because on Cygwin 1.5.x systems, the return type is size_t.  
*/
 _GL_CXXALIAS_SYS_CAST (getpagesize, int, (void));
 # endif
-# if @HAVE_DECL_GETPAGESIZE@
+# if 1
 _GL_CXXALIASWARN (getpagesize);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -822,10 +1134,10 @@ _GL_WARN_ON_USE (getpagesize, "getpagesize is unportable 
- "
 #endif
 
 
-#if @GNULIB_GETUSERSHELL@
+#if 0
 /* Return the next valid login shell on the system, or NULL when the end of
    the list has been reached.  */
-# if address@hidden@
+# if !1
 _GL_FUNCDECL_SYS (getusershell, char *, (void));
 # endif
 _GL_CXXALIAS_SYS (getusershell, char *, (void));
@@ -838,9 +1150,9 @@ _GL_WARN_ON_USE (getusershell, "getusershell is unportable 
- "
 # endif
 #endif
 
-#if @GNULIB_GETUSERSHELL@
+#if 0
 /* Rewind to pointer that is advanced at each getusershell() call.  */
-# if address@hidden@
+# if !1
 _GL_FUNCDECL_SYS (setusershell, void, (void));
 # endif
 _GL_CXXALIAS_SYS (setusershell, void, (void));
@@ -853,10 +1165,10 @@ _GL_WARN_ON_USE (setusershell, "setusershell is 
unportable - "
 # endif
 #endif
 
-#if @GNULIB_GETUSERSHELL@
+#if 0
 /* Free the pointer that is advanced at each getusershell() call and
    associated resources.  */
-# if address@hidden@
+# if !1
 _GL_FUNCDECL_SYS (endusershell, void, (void));
 # endif
 _GL_CXXALIAS_SYS (endusershell, void, (void));
@@ -870,13 +1182,13 @@ _GL_WARN_ON_USE (endusershell, "endusershell is 
unportable - "
 #endif
 
 
-#if @GNULIB_LCHOWN@
+#if 0
 /* Change the owner of FILE to UID (if UID is not -1) and the group of FILE
    to GID (if GID is not -1).  Do not follow symbolic links.
    Return 0 if successful, otherwise -1 and errno set.
    See the POSIX:2001 specification
    <http://www.opengroup.org/susv3xsh/lchown.html>.  */
-# if @REPLACE_LCHOWN@
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef lchown
 #   define lchown rpl_lchown
@@ -885,7 +1197,7 @@ _GL_FUNCDECL_RPL (lchown, int, (char const *file, uid_t 
owner, gid_t group)
                                _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (lchown, int, (char const *file, uid_t owner, gid_t group));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (lchown, int, (char const *file, uid_t owner, gid_t group)
                                _GL_ARG_NONNULL ((1)));
 #  endif
@@ -901,12 +1213,12 @@ _GL_WARN_ON_USE (lchown, "lchown is unportable to 
pre-POSIX.1-2001 systems - "
 #endif
 
 
-#if @GNULIB_LINK@
+#if 0
 /* Create a new hard link for an existing file.
    Return 0 if successful, otherwise -1 and errno set.
    See POSIX:2001 specification
    <http://www.opengroup.org/susv3xsh/link.html>.  */
-# if @REPLACE_LINK@
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define link rpl_link
 #  endif
@@ -914,7 +1226,7 @@ _GL_FUNCDECL_RPL (link, int, (const char *path1, const 
char *path2)
                              _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (link, int, (const char *path1, const char *path2));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (link, int, (const char *path1, const char *path2)
                              _GL_ARG_NONNULL ((1, 2)));
 #  endif
@@ -930,11 +1242,11 @@ _GL_WARN_ON_USE (link, "link is unportable - "
 #endif
 
 
-#if @GNULIB_LINKAT@
+#if 0
 /* Create a new hard link for an existing file, relative to two
    directories.  FLAG controls whether symlinks are followed.
    Return 0 if successful, otherwise -1 and errno set.  */
-# if @REPLACE_LINKAT@
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef linkat
 #   define linkat rpl_linkat
@@ -947,7 +1259,7 @@ _GL_CXXALIAS_RPL (linkat, int,
                   (int fd1, const char *path1, int fd2, const char *path2,
                    int flag));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (linkat, int,
                   (int fd1, const char *path1, int fd2, const char *path2,
                    int flag)
@@ -967,12 +1279,12 @@ _GL_WARN_ON_USE (linkat, "linkat is unportable - "
 #endif
 
 
-#if @GNULIB_LSEEK@
+#if 1
 /* Set the offset of FD relative to SEEK_SET, SEEK_CUR, or SEEK_END.
    Return the new offset if successful, otherwise -1 and errno set.
    See the POSIX:2001 specification
    <http://www.opengroup.org/susv3xsh/lseek.html>.  */
-# if @REPLACE_LSEEK@
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define lseek rpl_lseek
 #  endif
@@ -991,11 +1303,11 @@ _GL_WARN_ON_USE (lseek, "lseek does not fail with ESPIPE 
on pipes on some "
 #endif
 
 
-#if @GNULIB_PIPE@
+#if 0
 /* Create a pipe, defaulting to O_BINARY mode.
    Store the read-end as fd[0] and the write-end as fd[1].
    Return 0 upon success, or -1 with errno set upon failure.  */
-# if address@hidden@
+# if !1
 _GL_FUNCDECL_SYS (pipe, int, (int fd[2]) _GL_ARG_NONNULL ((1)));
 # endif
 _GL_CXXALIAS_SYS (pipe, int, (int fd[2]));
@@ -1009,7 +1321,7 @@ _GL_WARN_ON_USE (pipe, "pipe is unportable - "
 #endif
 
 
-#if @GNULIB_PIPE2@
+#if 0
 /* Create a pipe, applying the given flags when opening the read-end of the
    pipe and the write-end of the pipe.
    The flags are a bitmask, possibly including O_CLOEXEC (defined in <fcntl.h>)
@@ -1018,7 +1330,7 @@ _GL_WARN_ON_USE (pipe, "pipe is unportable - "
    Return 0 upon success, or -1 with errno set upon failure.
    See also the Linux man page at
    <http://www.kernel.org/doc/man-pages/online/pages/man2/pipe2.2.html>.  */
-# if @HAVE_PIPE2@
+# if 1
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define pipe2 rpl_pipe2
 #  endif
@@ -1038,12 +1350,12 @@ _GL_WARN_ON_USE (pipe2, "pipe2 is unportable - "
 #endif
 
 
-#if @GNULIB_PREAD@
+#if 0
 /* Read at most BUFSIZE bytes from FD into BUF, starting at OFFSET.
    Return the number of bytes placed into BUF if successful, otherwise
    set errno and return -1.  0 indicates EOF.  See the POSIX:2001
    specification <http://www.opengroup.org/susv3xsh/pread.html>.  */
-# if @REPLACE_PREAD@
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define pread rpl_pread
 #  endif
@@ -1053,7 +1365,7 @@ _GL_FUNCDECL_RPL (pread, ssize_t,
 _GL_CXXALIAS_RPL (pread, ssize_t,
                   (int fd, void *buf, size_t bufsize, off_t offset));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (pread, ssize_t,
                   (int fd, void *buf, size_t bufsize, off_t offset)
                   _GL_ARG_NONNULL ((2)));
@@ -1071,13 +1383,13 @@ _GL_WARN_ON_USE (pread, "pread is unportable - "
 #endif
 
 
-#if @GNULIB_PWRITE@
+#if 0
 /* Write at most BUFSIZE bytes from BUF into FD, starting at OFFSET.
    Return the number of bytes written if successful, otherwise
    set errno and return -1.  0 indicates nothing written.  See the
    POSIX:2001 specification
    <http://www.opengroup.org/susv3xsh/pwrite.html>.  */
-# if @REPLACE_PWRITE@
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define pwrite rpl_pwrite
 #  endif
@@ -1087,7 +1399,7 @@ _GL_FUNCDECL_RPL (pwrite, ssize_t,
 _GL_CXXALIAS_RPL (pwrite, ssize_t,
                   (int fd, const void *buf, size_t bufsize, off_t offset));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (pwrite, ssize_t,
                   (int fd, const void *buf, size_t bufsize, off_t offset)
                   _GL_ARG_NONNULL ((2)));
@@ -1105,13 +1417,13 @@ _GL_WARN_ON_USE (pwrite, "pwrite is unportable - "
 #endif
 
 
-#if @GNULIB_READLINK@
+#if 0
 /* Read the contents of the symbolic link FILE and place the first BUFSIZE
    bytes of it into BUF.  Return the number of bytes placed into BUF if
    successful, otherwise -1 and errno set.
    See the POSIX:2001 specification
    <http://www.opengroup.org/susv3xsh/readlink.html>.  */
-# if @REPLACE_READLINK@
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define readlink rpl_readlink
 #  endif
@@ -1121,7 +1433,7 @@ _GL_FUNCDECL_RPL (readlink, ssize_t,
 _GL_CXXALIAS_RPL (readlink, ssize_t,
                   (const char *file, char *buf, size_t bufsize));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (readlink, ssize_t,
                   (const char *file, char *buf, size_t bufsize)
                   _GL_ARG_NONNULL ((1, 2)));
@@ -1139,8 +1451,8 @@ _GL_WARN_ON_USE (readlink, "readlink is unportable - "
 #endif
 
 
-#if @GNULIB_READLINKAT@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (readlinkat, ssize_t,
                   (int fd, char const *file, char *buf, size_t len)
                   _GL_ARG_NONNULL ((2, 3)));
@@ -1157,9 +1469,9 @@ _GL_WARN_ON_USE (readlinkat, "readlinkat is not portable 
- "
 #endif
 
 
-#if @GNULIB_RMDIR@
+#if 0
 /* Remove the directory DIR.  */
-# if @REPLACE_RMDIR@
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define rmdir rpl_rmdir
 #  endif
@@ -1178,12 +1490,12 @@ _GL_WARN_ON_USE (rmdir, "rmdir is unportable - "
 #endif
 
 
-#if @GNULIB_SLEEP@
+#if 0
 /* Pause the execution of the current thread for N seconds.
    Returns the number of seconds left to sleep.
    See the POSIX:2001 specification
    <http://www.opengroup.org/susv3xsh/sleep.html>.  */
-# if @REPLACE_SLEEP@
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef sleep
 #   define sleep rpl_sleep
@@ -1191,7 +1503,7 @@ _GL_WARN_ON_USE (rmdir, "rmdir is unportable - "
 _GL_FUNCDECL_RPL (sleep, unsigned int, (unsigned int n));
 _GL_CXXALIAS_RPL (sleep, unsigned int, (unsigned int n));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (sleep, unsigned int, (unsigned int n));
 #  endif
 _GL_CXXALIAS_SYS (sleep, unsigned int, (unsigned int n));
@@ -1206,8 +1518,8 @@ _GL_WARN_ON_USE (sleep, "sleep is unportable - "
 #endif
 
 
-#if @GNULIB_SYMLINK@
-# if @REPLACE_SYMLINK@
+#if 0
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef symlink
 #   define symlink rpl_symlink
@@ -1216,7 +1528,7 @@ _GL_FUNCDECL_RPL (symlink, int, (char const *contents, 
char const *file)
                                 _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (symlink, int, (char const *contents, char const *file));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (symlink, int, (char const *contents, char const *file)
                                 _GL_ARG_NONNULL ((1, 2)));
 #  endif
@@ -1232,8 +1544,8 @@ _GL_WARN_ON_USE (symlink, "symlink is not portable - "
 #endif
 
 
-#if @GNULIB_SYMLINKAT@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (symlinkat, int,
                   (char const *contents, int fd, char const *file)
                   _GL_ARG_NONNULL ((1, 3)));
@@ -1250,10 +1562,10 @@ _GL_WARN_ON_USE (symlinkat, "symlinkat is not portable 
- "
 #endif
 
 
-#if @GNULIB_TTYNAME_R@
+#if 0
 /* Store at most BUFLEN characters of the pathname of the terminal FD is
    open on in BUF.  Return 0 on success, otherwise an error number.  */
-# if @REPLACE_TTYNAME_R@
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef ttyname_r
 #   define ttyname_r rpl_ttyname_r
@@ -1263,7 +1575,7 @@ _GL_FUNCDECL_RPL (ttyname_r, int,
 _GL_CXXALIAS_RPL (ttyname_r, int,
                   (int fd, char *buf, size_t buflen));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (ttyname_r, int,
                   (int fd, char *buf, size_t buflen) _GL_ARG_NONNULL ((2)));
 #  endif
@@ -1280,8 +1592,8 @@ _GL_WARN_ON_USE (ttyname_r, "ttyname_r is not portable - "
 #endif
 
 
-#if @GNULIB_UNLINK@
-# if @REPLACE_UNLINK@
+#if 0
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef unlink
 #   define unlink rpl_unlink
@@ -1301,8 +1613,8 @@ _GL_WARN_ON_USE (unlink, "unlink is not portable - "
 #endif
 
 
-#if @GNULIB_UNLINKAT@
-# if @REPLACE_UNLINKAT@
+#if 0
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef unlinkat
 #   define unlinkat rpl_unlinkat
@@ -1311,7 +1623,7 @@ _GL_FUNCDECL_RPL (unlinkat, int, (int fd, char const 
*file, int flag)
                                  _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (unlinkat, int, (int fd, char const *file, int flag));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (unlinkat, int, (int fd, char const *file, int flag)
                                  _GL_ARG_NONNULL ((2)));
 #  endif
@@ -1327,12 +1639,12 @@ _GL_WARN_ON_USE (unlinkat, "unlinkat is not portable - "
 #endif
 
 
-#if @GNULIB_USLEEP@
+#if 0
 /* Pause the execution of the current thread for N microseconds.
    Returns 0 on completion, or -1 on range error.
    See the POSIX:2001 specification
    <http://www.opengroup.org/susv3xsh/sleep.html>.  */
-# if @REPLACE_USLEEP@
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef usleep
 #   define usleep rpl_usleep
@@ -1340,7 +1652,7 @@ _GL_WARN_ON_USE (unlinkat, "unlinkat is not portable - "
 _GL_FUNCDECL_RPL (usleep, int, (useconds_t n));
 _GL_CXXALIAS_RPL (usleep, int, (useconds_t n));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (usleep, int, (useconds_t n));
 #  endif
 _GL_CXXALIAS_SYS (usleep, int, (useconds_t n));
@@ -1355,11 +1667,11 @@ _GL_WARN_ON_USE (usleep, "usleep is unportable - "
 #endif
 
 
-#if @GNULIB_WRITE@
+#if 0
 /* Write up to COUNT bytes starting at BUF to file descriptor FD.
    See the POSIX:2001 specification
    <http://www.opengroup.org/susv3xsh/write.html>.  */
-# if @REPLACE_WRITE@ && @GNULIB_UNISTD_H_SIGPIPE@
+# if 0 && 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef write
 #   define write rpl_write
diff --git a/gl/warn-on-use.h b/gl/warn-on-use.h
new file mode 100644
index 0000000..9aebda4
--- /dev/null
+++ b/gl/warn-on-use.h
@@ -0,0 +1,46 @@
+#ifndef _GL_WARN_ON_USE
+
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+/* A compiler attribute is available in gcc versions 4.3.0 and later.  */
+#  define _GL_WARN_ON_USE(function, message) \
+extern __typeof__ (function) function __attribute__ ((__warning__ (message)))
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE(function, message) \
+extern __typeof__ (function) function
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+# endif
+#endif
+
+/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string")
+   is like _GL_WARN_ON_USE (function, "string"), except that the function is
+   declared with the given prototype, consisting of return type, parameters,
+   and attributes.
+   This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
+   not work in this case.  */
+#ifndef _GL_WARN_ON_USE_CXX
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes \
+     __attribute__ ((__warning__ (msg)))
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+# endif
+#endif
+
+/* _GL_WARN_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#ifndef _GL_WARN_EXTERN_C
+# if defined __cplusplus
+#  define _GL_WARN_EXTERN_C extern "C"
+# else
+#  define _GL_WARN_EXTERN_C extern
+# endif
+#endif
diff --git a/gl/wchar.in.h b/gl/wchar.h
similarity index 67%
copy from gl/wchar.in.h
copy to gl/wchar.h
index ab4c806..d7a61a8 100644
--- a/gl/wchar.in.h
+++ b/gl/wchar.h
@@ -1,3 +1,4 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
 
    Copyright (C) 2007-2011 Free Software Foundation, Inc.
@@ -27,9 +28,9 @@
  */
 
 #if __GNUC__ >= 3
address@hidden@
+#pragma GCC system_header
 #endif
address@hidden@
+
 
 #if defined __need_mbstate_t || defined __need_wint_t || (defined __hpux && 
((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined 
_GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H
 /* Special invocation convention:
@@ -44,7 +45,7 @@
      the latter includes <wchar.h>.  But here, we have no way to detect whether
      <wctype.h> is completely included or is still being included.  */
 
address@hidden@ @NEXT_WCHAR_H@
+#include_next <wchar.h>
 
 #else
 /* Normal invocation convention.  */
@@ -53,7 +54,7 @@
 
 #define _GL_ALREADY_INCLUDING_WCHAR_H
 
-#if @HAVE_FEATURES_H@
+#if 1
 # include <features.h> /* for __GLIBC__ */
 #endif
 
@@ -71,8 +72,8 @@
 /* Include the original <wchar.h> if it exists.
    Some builds of uClibc lack it.  */
 /* The include_next requires a split double-inclusion guard.  */
-#if @HAVE_WCHAR_H@
-# @INCLUDE_NEXT@ @NEXT_WCHAR_H@
+#if 1
+# include_next <wchar.h>
 #endif
 
 #undef _GL_ALREADY_INCLUDING_WCHAR_H
@@ -81,14 +82,325 @@
 #define _GL_WCHAR_H
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+#ifndef _GL_CXXDEFS_H
+#define _GL_CXXDEFS_H
+
+/* The three most frequent use cases of these macros are:
+
+   * For providing a substitute for a function that is missing on some
+     platforms, but is declared and works fine on the platforms on which
+     it exists:
+
+       #if @GNULIB_FOO@
+       # if address@hidden@
+       _GL_FUNCDECL_SYS (foo, ...);
+       # endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on all platforms,
+     but is broken/insufficient and needs to be replaced on some platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on some platforms
+     but is broken/insufficient and needs to be replaced on some of them and
+     is additionally either missing or undeclared on some other platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       #  if address@hidden@   or   if address@hidden@
+       _GL_FUNCDECL_SYS (foo, ...);
+       #  endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+*/
+
+/* _GL_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#if defined __cplusplus
+# define _GL_EXTERN_C extern "C"
+#else
+# define _GL_EXTERN_C extern
+#endif
+
+/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes);
+   declares a replacement function, named rpl_func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Example:
+     _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...)
+                                  _GL_ARG_NONNULL ((1)));
+ */
+#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \
+  _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes)
+#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \
+  _GL_EXTERN_C rettype rpl_func parameters_and_attributes
+
+/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes);
+   declares the system function, named func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Example:
+     _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...)
+                                  _GL_ARG_NONNULL ((1)));
+ */
+#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \
+  _GL_EXTERN_C rettype func parameters_and_attributes
+
+/* _GL_CXXALIAS_RPL (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to rpl_func, if GNULIB_NAMESPACE is defined.
+   Example:
+     _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
+ */
+#define _GL_CXXALIAS_RPL(func,rettype,parameters) \
+  _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters)
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                \
+    {                                                         \
+      rettype (*const func) parameters = ::rpl_func;          \
+    }                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters);
+   is like  _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters);
+   except that the C function rpl_func may have a slightly different
+   declaration.  A cast is used to silence the "invalid conversion" error
+   that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                     \
+    {                                                              \
+      rettype (*const func) parameters =                           \
+        reinterpret_cast<rettype(*)parameters>(::rpl_func);        \
+    }                                                              \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to the system provided function func, if GNULIB_NAMESPACE
+   is defined.
+   Example:
+     _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
+ */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+  /* If we were to write
+       rettype (*const func) parameters = ::func;
+     like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls
+     better (remove an indirection through a 'static' pointer variable),
+     but then the _GL_CXXALIASWARN macro below would cause a warning not only
+     for uses of ::func but also for uses of GNULIB_NAMESPACE::func.  */
+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                     \
+    {                                              \
+      static rettype (*func) parameters = ::func;  \
+    }                                              \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function func may have a slightly different declaration.
+   A cast is used to silence the "invalid conversion" error that would
+   otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                          \
+    {                                                   \
+      static rettype (*func) parameters =               \
+        reinterpret_cast<rettype(*)parameters>(::func); \
+    }                                                   \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function is picked among a set of overloaded functions,
+   namely the one with rettype2 and parameters2.  Two consecutive casts
+   are used to silence the "cannot find a match" and "invalid conversion"
+   errors that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+  /* The outer cast must be a reinterpret_cast.
+     The inner cast: When the function is defined as a set of overloaded
+     functions, it works as a static_cast<>, choosing the designated variant.
+     When the function is defined as a single variant, it works as a
+     reinterpret_cast<>. The parenthesized cast syntax works both ways.  */
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    namespace GNULIB_NAMESPACE                                                \
+    {                                                                         \
+      static rettype (*func) parameters =                                     \
+        reinterpret_cast<rettype(*)parameters>(                               \
+          (rettype2(*)parameters2)(::func));                                  \
+    }                                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN (func);
+   causes a warning to be emitted when ::func is used but not when
+   GNULIB_NAMESPACE::func is used.  func must be defined without overloaded
+   variants.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN(func) \
+   _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN_1(func,namespace) \
+   _GL_CXXALIASWARN_2 (func, namespace)
+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
+   we enable the warning only when not optimizing.  */
+# if !__OPTIMIZE__
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+    _GL_WARN_ON_USE (func, \
+                     "The symbol ::" #func " refers to the system function. " \
+                     "Use " #namespace "::" #func " instead.")
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN(func) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes);
+   causes a warning to be emitted when the given overloaded variant of ::func
+   is used but not when GNULIB_NAMESPACE::func is used.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+   _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \
+                        GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) 
\
+   _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
+   we enable the warning only when not optimizing.  */
+# if !__OPTIMIZE__
+#  define 
_GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+    _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \
+                         "The symbol ::" #func " refers to the system 
function. " \
+                         "Use " #namespace "::" #func " instead.")
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+#  define 
_GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define 
_GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+#endif /* _GL_CXXDEFS_H */
 
 /* The definition of _GL_ARG_NONNULL is copied here.  */
+/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
+   that the values passed as arguments n, ..., m must be non-NULL pointers.
+   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
+#ifndef _GL_ARG_NONNULL
+# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
+#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
+# else
+#  define _GL_ARG_NONNULL(params)
+# endif
+#endif
 
 /* The definition of _GL_WARN_ON_USE is copied here.  */
+#ifndef _GL_WARN_ON_USE
+
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+/* A compiler attribute is available in gcc versions 4.3.0 and later.  */
+#  define _GL_WARN_ON_USE(function, message) \
+extern __typeof__ (function) function __attribute__ ((__warning__ (message)))
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE(function, message) \
+extern __typeof__ (function) function
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+# endif
+#endif
+
+/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string")
+   is like _GL_WARN_ON_USE (function, "string"), except that the function is
+   declared with the given prototype, consisting of return type, parameters,
+   and attributes.
+   This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
+   not work in this case.  */
+#ifndef _GL_WARN_ON_USE_CXX
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes \
+     __attribute__ ((__warning__ (msg)))
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+# endif
+#endif
+
+/* _GL_WARN_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#ifndef _GL_WARN_EXTERN_C
+# if defined __cplusplus
+#  define _GL_WARN_EXTERN_C extern "C"
+# else
+#  define _GL_WARN_EXTERN_C extern
+# endif
+#endif
 
 
 /* Define wint_t and WEOF.  (Also done in wctype.in.h.)  */
-#if address@hidden@ && !defined wint_t
+#if !1 && !defined wint_t
 # define wint_t int
 # ifndef WEOF
 #  define WEOF -1
@@ -103,7 +415,7 @@
 /* Override mbstate_t if it is too small.
    On IRIX 6.5, sizeof (mbstate_t) == 1, which is not sufficient for
    implementing mbrtowc for encodings like UTF-8.  */
-#if !(@HAVE_MBSINIT@ && @HAVE_MBRTOWC@) || @REPLACE_MBSTATE_T@
+#if !(1 && 1) || 0
 # if !GNULIB_defined_mbstate_t
 typedef int rpl_mbstate_t;
 #  undef mbstate_t
@@ -114,8 +426,8 @@ typedef int rpl_mbstate_t;
 
 
 /* Convert a single-byte character to a wide character.  */
-#if @GNULIB_BTOWC@
-# if @REPLACE_BTOWC@
+#if 0
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef btowc
 #   define btowc rpl_btowc
@@ -123,7 +435,7 @@ typedef int rpl_mbstate_t;
 _GL_FUNCDECL_RPL (btowc, wint_t, (int c));
 _GL_CXXALIAS_RPL (btowc, wint_t, (int c));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (btowc, wint_t, (int c));
 #  endif
 _GL_CXXALIAS_SYS (btowc, wint_t, (int c));
@@ -139,8 +451,8 @@ _GL_WARN_ON_USE (btowc, "btowc is unportable - "
 
 
 /* Convert a wide character to a single-byte character.  */
-#if @GNULIB_WCTOB@
-# if @REPLACE_WCTOB@
+#if 0
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef wctob
 #   define wctob rpl_wctob
@@ -148,7 +460,7 @@ _GL_WARN_ON_USE (btowc, "btowc is unportable - "
 _GL_FUNCDECL_RPL (wctob, int, (wint_t wc));
 _GL_CXXALIAS_RPL (wctob, int, (wint_t wc));
 # else
-#  if !defined wctob && address@hidden@
+#  if !defined wctob && !1
 /* wctob is provided by gnulib, or wctob exists but is not declared.  */
 _GL_FUNCDECL_SYS (wctob, int, (wint_t wc));
 #  endif
@@ -165,8 +477,8 @@ _GL_WARN_ON_USE (wctob, "wctob is unportable - "
 
 
 /* Test whether *PS is in the initial state.  */
-#if @GNULIB_MBSINIT@
-# if @REPLACE_MBSINIT@
+#if 0
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef mbsinit
 #   define mbsinit rpl_mbsinit
@@ -174,7 +486,7 @@ _GL_WARN_ON_USE (wctob, "wctob is unportable - "
 _GL_FUNCDECL_RPL (mbsinit, int, (const mbstate_t *ps));
 _GL_CXXALIAS_RPL (mbsinit, int, (const mbstate_t *ps));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (mbsinit, int, (const mbstate_t *ps));
 #  endif
 _GL_CXXALIAS_SYS (mbsinit, int, (const mbstate_t *ps));
@@ -190,8 +502,8 @@ _GL_WARN_ON_USE (mbsinit, "mbsinit is unportable - "
 
 
 /* Convert a multibyte character to a wide character.  */
-#if @GNULIB_MBRTOWC@
-# if @REPLACE_MBRTOWC@
+#if 0
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef mbrtowc
 #   define mbrtowc rpl_mbrtowc
@@ -201,7 +513,7 @@ _GL_FUNCDECL_RPL (mbrtowc, size_t,
 _GL_CXXALIAS_RPL (mbrtowc, size_t,
                   (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (mbrtowc, size_t,
                   (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps));
 #  endif
@@ -219,8 +531,8 @@ _GL_WARN_ON_USE (mbrtowc, "mbrtowc is unportable - "
 
 
 /* Recognize a multibyte character.  */
-#if @GNULIB_MBRLEN@
-# if @REPLACE_MBRLEN@
+#if 0
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef mbrlen
 #   define mbrlen rpl_mbrlen
@@ -228,7 +540,7 @@ _GL_WARN_ON_USE (mbrtowc, "mbrtowc is unportable - "
 _GL_FUNCDECL_RPL (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps));
 _GL_CXXALIAS_RPL (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps));
 #  endif
 _GL_CXXALIAS_SYS (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps));
@@ -244,8 +556,8 @@ _GL_WARN_ON_USE (mbrlen, "mbrlen is unportable - "
 
 
 /* Convert a string to a wide string.  */
-#if @GNULIB_MBSRTOWCS@
-# if @REPLACE_MBSRTOWCS@
+#if 0
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef mbsrtowcs
 #   define mbsrtowcs rpl_mbsrtowcs
@@ -257,7 +569,7 @@ _GL_CXXALIAS_RPL (mbsrtowcs, size_t,
                   (wchar_t *dest, const char **srcp, size_t len,
                    mbstate_t *ps));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (mbsrtowcs, size_t,
                   (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps)
                   _GL_ARG_NONNULL ((2)));
@@ -277,8 +589,8 @@ _GL_WARN_ON_USE (mbsrtowcs, "mbsrtowcs is unportable - "
 
 
 /* Convert a string to a wide string.  */
-#if @GNULIB_MBSNRTOWCS@
-# if @REPLACE_MBSNRTOWCS@
+#if 0
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef mbsnrtowcs
 #   define mbsnrtowcs rpl_mbsnrtowcs
@@ -291,7 +603,7 @@ _GL_CXXALIAS_RPL (mbsnrtowcs, size_t,
                   (wchar_t *dest, const char **srcp, size_t srclen, size_t len,
                    mbstate_t *ps));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (mbsnrtowcs, size_t,
                   (wchar_t *dest, const char **srcp, size_t srclen, size_t len,
                    mbstate_t *ps)
@@ -312,8 +624,8 @@ _GL_WARN_ON_USE (mbsnrtowcs, "mbsnrtowcs is unportable - "
 
 
 /* Convert a wide character to a multibyte character.  */
-#if @GNULIB_WCRTOMB@
-# if @REPLACE_WCRTOMB@
+#if 0
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef wcrtomb
 #   define wcrtomb rpl_wcrtomb
@@ -321,7 +633,7 @@ _GL_WARN_ON_USE (mbsnrtowcs, "mbsnrtowcs is unportable - "
 _GL_FUNCDECL_RPL (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps));
 _GL_CXXALIAS_RPL (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps));
 #  endif
 _GL_CXXALIAS_SYS (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps));
@@ -337,8 +649,8 @@ _GL_WARN_ON_USE (wcrtomb, "wcrtomb is unportable - "
 
 
 /* Convert a wide string to a string.  */
-#if @GNULIB_WCSRTOMBS@
-# if @REPLACE_WCSRTOMBS@
+#if 0
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef wcsrtombs
 #   define wcsrtombs rpl_wcsrtombs
@@ -350,7 +662,7 @@ _GL_CXXALIAS_RPL (wcsrtombs, size_t,
                   (char *dest, const wchar_t **srcp, size_t len,
                    mbstate_t *ps));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (wcsrtombs, size_t,
                   (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps)
                   _GL_ARG_NONNULL ((2)));
@@ -370,8 +682,8 @@ _GL_WARN_ON_USE (wcsrtombs, "wcsrtombs is unportable - "
 
 
 /* Convert a wide string to a string.  */
-#if @GNULIB_WCSNRTOMBS@
-# if @REPLACE_WCSNRTOMBS@
+#if 0
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef wcsnrtombs
 #   define wcsnrtombs rpl_wcsnrtombs
@@ -384,7 +696,7 @@ _GL_CXXALIAS_RPL (wcsnrtombs, size_t,
                   (char *dest, const wchar_t **srcp, size_t srclen, size_t len,
                    mbstate_t *ps));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (wcsnrtombs, size_t,
                   (char *dest, const wchar_t **srcp, size_t srclen, size_t len,
                    mbstate_t *ps)
@@ -405,8 +717,8 @@ _GL_WARN_ON_USE (wcsnrtombs, "wcsnrtombs is unportable - "
 
 
 /* Return the number of screen columns needed for WC.  */
-#if @GNULIB_WCWIDTH@
-# if @REPLACE_WCWIDTH@
+#if 0
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef wcwidth
 #   define wcwidth rpl_wcwidth
@@ -414,7 +726,7 @@ _GL_WARN_ON_USE (wcsnrtombs, "wcsnrtombs is unportable - "
 _GL_FUNCDECL_RPL (wcwidth, int, (wchar_t));
 _GL_CXXALIAS_RPL (wcwidth, int, (wchar_t));
 # else
-#  if address@hidden@
+#  if !1
 /* wcwidth exists but is not declared.  */
 _GL_FUNCDECL_SYS (wcwidth, int, (wchar_t));
 #  endif
@@ -431,8 +743,8 @@ _GL_WARN_ON_USE (wcwidth, "wcwidth is unportable - "
 
 
 /* Search N wide characters of S for C.  */
-#if @GNULIB_WMEMCHR@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wmemchr, wchar_t *, (const wchar_t *s, wchar_t c, size_t n));
 # endif
   /* On some systems, this function is defined as an overloaded function:
@@ -461,8 +773,8 @@ _GL_WARN_ON_USE (wmemchr, "wmemchr is unportable - "
 
 
 /* Compare N wide characters of S1 and S2.  */
-#if @GNULIB_WMEMCMP@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wmemcmp, int,
                   (const wchar_t *s1, const wchar_t *s2, size_t n));
 # endif
@@ -479,8 +791,8 @@ _GL_WARN_ON_USE (wmemcmp, "wmemcmp is unportable - "
 
 
 /* Copy N wide characters of SRC to DEST.  */
-#if @GNULIB_WMEMCPY@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wmemcpy, wchar_t *,
                   (wchar_t *dest, const wchar_t *src, size_t n));
 # endif
@@ -498,8 +810,8 @@ _GL_WARN_ON_USE (wmemcpy, "wmemcpy is unportable - "
 
 /* Copy N wide characters of SRC to DEST, guaranteeing correct behavior for
    overlapping memory areas.  */
-#if @GNULIB_WMEMMOVE@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wmemmove, wchar_t *,
                   (wchar_t *dest, const wchar_t *src, size_t n));
 # endif
@@ -516,8 +828,8 @@ _GL_WARN_ON_USE (wmemmove, "wmemmove is unportable - "
 
 
 /* Set N wide characters of S to C.  */
-#if @GNULIB_WMEMSET@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n));
 # endif
 _GL_CXXALIAS_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n));
@@ -532,8 +844,8 @@ _GL_WARN_ON_USE (wmemset, "wmemset is unportable - "
 
 
 /* Return the number of wide characters in S.  */
-#if @GNULIB_WCSLEN@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcslen, size_t, (const wchar_t *s));
 # endif
 _GL_CXXALIAS_SYS (wcslen, size_t, (const wchar_t *s));
@@ -548,8 +860,8 @@ _GL_WARN_ON_USE (wcslen, "wcslen is unportable - "
 
 
 /* Return the number of wide characters in S, but at most MAXLEN.  */
-#if @GNULIB_WCSNLEN@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen));
 # endif
 _GL_CXXALIAS_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen));
@@ -564,8 +876,8 @@ _GL_WARN_ON_USE (wcsnlen, "wcsnlen is unportable - "
 
 
 /* Copy SRC to DEST.  */
-#if @GNULIB_WCSCPY@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcscpy, wchar_t *, (wchar_t *dest, const wchar_t *src));
 # endif
 _GL_CXXALIAS_SYS (wcscpy, wchar_t *, (wchar_t *dest, const wchar_t *src));
@@ -580,8 +892,8 @@ _GL_WARN_ON_USE (wcscpy, "wcscpy is unportable - "
 
 
 /* Copy SRC to DEST, returning the address of the terminating L'\0' in DEST.  
*/
-#if @GNULIB_WCPCPY@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcpcpy, wchar_t *, (wchar_t *dest, const wchar_t *src));
 # endif
 _GL_CXXALIAS_SYS (wcpcpy, wchar_t *, (wchar_t *dest, const wchar_t *src));
@@ -596,8 +908,8 @@ _GL_WARN_ON_USE (wcpcpy, "wcpcpy is unportable - "
 
 
 /* Copy no more than N wide characters of SRC to DEST.  */
-#if @GNULIB_WCSNCPY@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcsncpy, wchar_t *,
                   (wchar_t *dest, const wchar_t *src, size_t n));
 # endif
@@ -615,8 +927,8 @@ _GL_WARN_ON_USE (wcsncpy, "wcsncpy is unportable - "
 
 /* Copy no more than N characters of SRC to DEST, returning the address of
    the last character written into DEST.  */
-#if @GNULIB_WCPNCPY@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcpncpy, wchar_t *,
                   (wchar_t *dest, const wchar_t *src, size_t n));
 # endif
@@ -633,8 +945,8 @@ _GL_WARN_ON_USE (wcpncpy, "wcpncpy is unportable - "
 
 
 /* Append SRC onto DEST.  */
-#if @GNULIB_WCSCAT@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcscat, wchar_t *, (wchar_t *dest, const wchar_t *src));
 # endif
 _GL_CXXALIAS_SYS (wcscat, wchar_t *, (wchar_t *dest, const wchar_t *src));
@@ -649,8 +961,8 @@ _GL_WARN_ON_USE (wcscat, "wcscat is unportable - "
 
 
 /* Append no more than N wide characters of SRC onto DEST.  */
-#if @GNULIB_WCSNCAT@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcsncat, wchar_t *,
                   (wchar_t *dest, const wchar_t *src, size_t n));
 # endif
@@ -667,8 +979,8 @@ _GL_WARN_ON_USE (wcsncat, "wcsncat is unportable - "
 
 
 /* Compare S1 and S2.  */
-#if @GNULIB_WCSCMP@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2));
 # endif
 _GL_CXXALIAS_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2));
@@ -683,8 +995,8 @@ _GL_WARN_ON_USE (wcscmp, "wcscmp is unportable - "
 
 
 /* Compare no more than N wide characters of S1 and S2.  */
-#if @GNULIB_WCSNCMP@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcsncmp, int,
                   (const wchar_t *s1, const wchar_t *s2, size_t n));
 # endif
@@ -701,8 +1013,8 @@ _GL_WARN_ON_USE (wcsncmp, "wcsncmp is unportable - "
 
 
 /* Compare S1 and S2, ignoring case.  */
-#if @GNULIB_WCSCASECMP@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2));
 # endif
 _GL_CXXALIAS_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2));
@@ -717,8 +1029,8 @@ _GL_WARN_ON_USE (wcscasecmp, "wcscasecmp is unportable - "
 
 
 /* Compare no more than N chars of S1 and S2, ignoring case.  */
-#if @GNULIB_WCSNCASECMP@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcsncasecmp, int,
                   (const wchar_t *s1, const wchar_t *s2, size_t n));
 # endif
@@ -736,8 +1048,8 @@ _GL_WARN_ON_USE (wcsncasecmp, "wcsncasecmp is unportable - 
"
 
 /* Compare S1 and S2, both interpreted as appropriate to the LC_COLLATE
    category of the current locale.  */
-#if @GNULIB_WCSCOLL@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2));
 # endif
 _GL_CXXALIAS_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2));
@@ -754,8 +1066,8 @@ _GL_WARN_ON_USE (wcscoll, "wcscoll is unportable - "
 /* Transform S2 into array pointed to by S1 such that if wcscmp is applied
    to two transformed strings the result is the as applying 'wcscoll' to the
    original strings.  */
-#if @GNULIB_WCSXFRM@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcsxfrm, size_t, (wchar_t *s1, const wchar_t *s2, size_t n));
 # endif
 _GL_CXXALIAS_SYS (wcsxfrm, size_t, (wchar_t *s1, const wchar_t *s2, size_t n));
@@ -770,8 +1082,8 @@ _GL_WARN_ON_USE (wcsxfrm, "wcsxfrm is unportable - "
 
 
 /* Duplicate S, returning an identical malloc'd string.  */
-#if @GNULIB_WCSDUP@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s));
 # endif
 _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s));
@@ -786,8 +1098,8 @@ _GL_WARN_ON_USE (wcsdup, "wcsdup is unportable - "
 
 
 /* Find the first occurrence of WC in WCS.  */
-#if @GNULIB_WCSCHR@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcschr, wchar_t *, (const wchar_t *wcs, wchar_t wc));
 # endif
   /* On some systems, this function is defined as an overloaded function:
@@ -815,8 +1127,8 @@ _GL_WARN_ON_USE (wcschr, "wcschr is unportable - "
 
 
 /* Find the last occurrence of WC in WCS.  */
-#if @GNULIB_WCSRCHR@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcsrchr, wchar_t *, (const wchar_t *wcs, wchar_t wc));
 # endif
   /* On some systems, this function is defined as an overloaded function:
@@ -845,8 +1157,8 @@ _GL_WARN_ON_USE (wcsrchr, "wcsrchr is unportable - "
 
 /* Return the length of the initial segmet of WCS which consists entirely
    of wide characters not in REJECT.  */
-#if @GNULIB_WCSCSPN@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t 
*reject));
 # endif
 _GL_CXXALIAS_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t 
*reject));
@@ -862,8 +1174,8 @@ _GL_WARN_ON_USE (wcscspn, "wcscspn is unportable - "
 
 /* Return the length of the initial segmet of WCS which consists entirely
    of wide characters in ACCEPT.  */
-#if @GNULIB_WCSSPN@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept));
 # endif
 _GL_CXXALIAS_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept));
@@ -878,8 +1190,8 @@ _GL_WARN_ON_USE (wcsspn, "wcsspn is unportable - "
 
 
 /* Find the first occurrence in WCS of any character in ACCEPT.  */
-#if @GNULIB_WCSPBRK@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcspbrk, wchar_t *,
                   (const wchar_t *wcs, const wchar_t *accept));
 # endif
@@ -910,8 +1222,8 @@ _GL_WARN_ON_USE (wcspbrk, "wcspbrk is unportable - "
 
 
 /* Find the first occurrence of NEEDLE in HAYSTACK.  */
-#if @GNULIB_WCSSTR@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcsstr, wchar_t *,
                   (const wchar_t *haystack, const wchar_t *needle));
 # endif
@@ -942,8 +1254,8 @@ _GL_WARN_ON_USE (wcsstr, "wcsstr is unportable - "
 
 
 /* Divide WCS into tokens separated by characters in DELIM.  */
-#if @GNULIB_WCSTOK@
-# if address@hidden@
+#if 0
+# if !1
 _GL_FUNCDECL_SYS (wcstok, wchar_t *,
                   (wchar_t *wcs, const wchar_t *delim, wchar_t **ptr));
 # endif
@@ -961,8 +1273,8 @@ _GL_WARN_ON_USE (wcstok, "wcstok is unportable - "
 
 /* Determine number of column positions required for first N wide
    characters (or fewer if S ends before this) in S.  */
-#if @GNULIB_WCSWIDTH@
-# if @REPLACE_WCSWIDTH@
+#if 0
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef wcswidth
 #   define wcswidth rpl_wcswidth
@@ -970,7 +1282,7 @@ _GL_WARN_ON_USE (wcstok, "wcstok is unportable - "
 _GL_FUNCDECL_RPL (wcswidth, int, (const wchar_t *s, size_t n));
 _GL_CXXALIAS_RPL (wcswidth, int, (const wchar_t *s, size_t n));
 # else
-#  if address@hidden@
+#  if !1
 _GL_FUNCDECL_SYS (wcswidth, int, (const wchar_t *s, size_t n));
 #  endif
 _GL_CXXALIAS_SYS (wcswidth, int, (const wchar_t *s, size_t n));


hooks/post-receive
-- 
GNU gnutls



reply via email to

[Prev in Thread] Current Thread [Next in Thread]