Imported Upstream version 3.1.0

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

diff --git a/gnulib/sys_time.in.h b/gnulib/sys_time.in.h
index 6b65cb617eb4febec8a71d43c962aab88a721ab4..d9fb361b87d87ca257df661adf36697a65dca915 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 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008 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 3, or (at your option)
+   the Free Software Foundation; either version 2, 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,


@@ -18,6 +18,10 @@
 
 /* Written by Paul Eggert.  */
 
 
 /* Written by Paul Eggert.  */
 

+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+

 #if defined _GL_SYS_TIME_H
 
 /* Simply delegate to the system's header, without adding anything.  */
 #if defined _GL_SYS_TIME_H
 
 /* Simply delegate to the system's header, without adding anything.  */


@@ -35,6 +39,10 @@
 #  include <time.h>
 # endif
 
 #  include <time.h>
 # endif
 

+#ifdef __cplusplus
+extern "C" {
+#endif
+

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


@@ -46,7 +54,11 @@ struct timeval
 # if @REPLACE_GETTIMEOFDAY@
 #  undef gettimeofday
 #  define gettimeofday rpl_gettimeofday
 # if @REPLACE_GETTIMEOFDAY@
 #  undef gettimeofday
 #  define gettimeofday rpl_gettimeofday

-int gettimeofday (struct timeval *, void *);
+int gettimeofday (struct timeval *restrict, void *restrict);

 # endif
 
 # endif
 

+#ifdef __cplusplus
+}
+#endif
+

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