*** ./gl/unistd.in.h.ORIG	Fri May 21 15:38:58 2010
--- ./gl/unistd.in.h	Fri May 21 15:39:15 2010
***************
*** 93,99 ****
  
  /* Get getopt(), optarg, optind, opterr, optopt.
     But avoid namespace pollution on glibc systems.  */
! #if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT
  # include <getopt.h>
  #endif
  
--- 93,99 ----
  
  /* Get getopt(), optarg, optind, opterr, optopt.
     But avoid namespace pollution on glibc systems.  */
! #if @GNULIB_UNISTD_H_GETOPT@ && !defined _AIX51 && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT
  # include <getopt.h>
  #endif
  
*** ./gl/time.in.h.ORIG	Wed Mar 14 00:42:53 2012
--- ./gl/time.in.h	Wed Mar 14 00:43:23 2012
***************
*** 147,165 ****
  #    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 ! @HAVE_DECL_LOCALTIME_R@
! _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 @HAVE_DECL_LOCALTIME_R@
  _GL_CXXALIASWARN (localtime_r);
--- 147,165 ----
  #    undef localtime_r
  #    define localtime_r rpl_localtime_r
  #   endif
! _GL_FUNCDECL_RPL (localtime_r, struct tm *, (time_t const *__timer,
!                                              struct tm *__result)
                                              _GL_ARG_NONNULL ((1, 2)));
! _GL_CXXALIAS_RPL (localtime_r, struct tm *, (time_t const *__timer,
!                                              struct tm *__result));
  #  else
  #   if ! @HAVE_DECL_LOCALTIME_R@
! _GL_FUNCDECL_SYS (localtime_r, struct tm *, (time_t const *__timer,
!                                              struct tm *__result)
                                              _GL_ARG_NONNULL ((1, 2)));
  #   endif
! _GL_CXXALIAS_SYS (localtime_r, struct tm *, (time_t const *__timer,
!                                              struct tm *__result));
  #  endif
  #  if @HAVE_DECL_LOCALTIME_R@
  _GL_CXXALIASWARN (localtime_r);
***************
*** 169,187 ****
  #    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 ! @HAVE_DECL_LOCALTIME_R@
! _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 @HAVE_DECL_LOCALTIME_R@
  _GL_CXXALIASWARN (gmtime_r);
--- 169,187 ----
  #    undef gmtime_r
  #    define gmtime_r rpl_gmtime_r
  #   endif
! _GL_FUNCDECL_RPL (gmtime_r, struct tm *, (time_t const *__timer,
!                                           struct tm *__result)
                                           _GL_ARG_NONNULL ((1, 2)));
! _GL_CXXALIAS_RPL (gmtime_r, struct tm *, (time_t const *__timer,
!                                           struct tm *__result));
  #  else
  #   if ! @HAVE_DECL_LOCALTIME_R@
! _GL_FUNCDECL_SYS (gmtime_r, struct tm *, (time_t const *__timer,
!                                           struct tm *__result)
                                           _GL_ARG_NONNULL ((1, 2)));
  #   endif
! _GL_CXXALIAS_SYS (gmtime_r, struct tm *, (time_t const *__timer,
!                                           struct tm *__result));
  #  endif
  #  if @HAVE_DECL_LOCALTIME_R@
  _GL_CXXALIASWARN (gmtime_r);
***************
*** 193,206 ****
     <http://www.opengroup.org/susv3xsh/strptime.html>.  */
  # if @GNULIB_STRPTIME@
  #  if ! @HAVE_STRPTIME@
! _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
  
--- 193,206 ----
     <http://www.opengroup.org/susv3xsh/strptime.html>.  */
  # if @GNULIB_STRPTIME@
  #  if ! @HAVE_STRPTIME@
! _GL_FUNCDECL_SYS (strptime, char *, (char const *__buf,
!                                      char const *__format,
!                                      struct tm *__tm)
                                      _GL_ARG_NONNULL ((1, 2, 3)));
  #  endif
! _GL_CXXALIAS_SYS (strptime, char *, (char const *__buf,
!                                      char const *__format,
!                                      struct tm *__tm));
  _GL_CXXALIASWARN (strptime);
  # endif