Imported Upstream version 3.2.0

[debian/amanda] / gnulib / sys_time.in.h

diff --git a/gnulib/sys_time.in.h b/gnulib/sys_time.in.h
index d9fb361b87d87ca257df661adf36697a65dca915..d7c091cfe38c17d6c24c31284052e9af108ad00f 100644 (file)
--- a/gnulib/sys_time.in.h
+++ b/gnulib/sys_time.in.h
@@ -1,10 +1,10 @@
 /* Provide a more complete sys/time.h.
 
 /* Provide a more complete sys/time.h.
 

-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 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
 
    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 2, or (at your option)
+   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,
    any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -39,9 +39,15 @@
 #  include <time.h>
 # endif
 
 #  include <time.h>
 # endif
 

-#ifdef __cplusplus
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
+# ifdef __cplusplus

 extern "C" {
 extern "C" {

-#endif
+# endif

 
 # if ! @HAVE_STRUCT_TIMEVAL@
 struct timeval
 
 # if ! @HAVE_STRUCT_TIMEVAL@
 struct timeval


@@ -51,14 +57,39 @@ struct timeval
 };
 # endif
 
 };
 # endif
 

-# if @REPLACE_GETTIMEOFDAY@
-#  undef gettimeofday
-#  define gettimeofday rpl_gettimeofday
-int gettimeofday (struct timeval *restrict, void *restrict);
+# ifdef __cplusplus
+}

 # endif
 
 # endif
 

-#ifdef __cplusplus
-}
-#endif
+# if @GNULIB_GETTIMEOFDAY@
+#  if @REPLACE_GETTIMEOFDAY@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef gettimeofday
+#    define gettimeofday rpl_gettimeofday
+#   endif
+_GL_FUNCDECL_RPL (gettimeofday, int,
+                  (struct timeval *restrict, void *restrict)
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (gettimeofday, int,
+                  (struct timeval *restrict, void *restrict));
+#  else
+#   if !@HAVE_GETTIMEOFDAY@
+_GL_FUNCDECL_SYS (gettimeofday, int,
+                  (struct timeval *restrict, void *restrict)
+                  _GL_ARG_NONNULL ((1)));
+#   endif
+/* Need to cast, because on glibc systems, by default, the second argument is
+                                                  struct timezone *.  */
+_GL_CXXALIAS_SYS_CAST (gettimeofday, int,
+                       (struct timeval *restrict, void *restrict));
+#  endif
+_GL_CXXALIASWARN (gettimeofday);
+# elif defined GNULIB_POSIXCHECK
+#  undef gettimeofday
+#  if HAVE_RAW_DECL_GETTIMEOFDAY
+_GL_WARN_ON_USE (gettimeofday, "gettimeofday is unportable - "
+                 "use gnulib module gettimeofday for portability");
+#  endif
+# endif

 
 #endif /* _GL_SYS_TIME_H */
 
 #endif /* _GL_SYS_TIME_H */