(Fdelete_frame): If we're in single_bboard_state on

[gnu-emacs] / src / systime.h

diff --git a/src/systime.h b/src/systime.h
index 2f9ace521e2ea7dae3a5acee6a08d1f6076fd2c0..778e555c979443d586fc401f1612ca26df1a0b7d 100644 (file)
--- a/src/systime.h
+++ b/src/systime.h
@@ -18,8 +18,8 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#ifndef _SYSTIME_H
-#define _SYSTIME_H
+#ifndef EMACS_SYSTIME_H
+#define EMACS_SYSTIME_H
 
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -81,7 +81,7 @@ extern time_t timezone;
        result in DEST.  SRC should not be negative.
 
    EMACS_SUB_TIME (DEST, SRC1, SRC2) subtracts SRC2 from SRC1 and
-       stores the result in DEST.  SRC should not be negative. 
+       stores the result in DEST.  SRC should not be negative.
    EMACS_TIME_NEG_P (TIME) is true iff TIME is negative.
 
 */
@@ -100,11 +100,16 @@ extern time_t timezone;
 #ifdef GETTIMEOFDAY_ONE_ARGUMENT
 #define EMACS_GET_TIME(time) gettimeofday (&(time))
 #else /* not GETTIMEOFDAY_ONE_ARGUMENT */
+#ifdef HAVE_STRUCT_TIMEZONE
 #define EMACS_GET_TIME(time)                   \
   do {                                         \
     struct timezone dummy;                     \
     gettimeofday (&(time), &dummy);            \
   } while (0)
+#else
+/* Presumably the second arg is ignored.  */
+#define EMACS_GET_TIME(time) gettimeofday (&(time), NULL)
+#endif /* HAVE_STRUCT_TIMEZONE */
 #endif /* not GETTIMEOFDAY_ONE_ARGUMENT */
 
 #define EMACS_ADD_TIME(dest, src1, src2)               \
@@ -146,7 +151,7 @@ extern time_t timezone;
 #define EMACS_SET_SECS_USECS(time, secs, usecs)                \
   (EMACS_SET_SECS (time, secs), EMACS_SET_USECS (time, usecs))
 
-extern int set_file_times ();
+extern int set_file_times __P ((const char *, EMACS_TIME, EMACS_TIME));
 
 /* Compare times T1 and T2.  Value is 0 if T1 and T2 are the same.
    Value is < 0 if T1 is less than T2.  Value is > 0 otherwise.  */
@@ -166,4 +171,7 @@ extern int set_file_times ();
 #define EMACS_TIME_LT(T1, T2) (EMACS_TIME_CMP (T1, T2) < 0)
 #define EMACS_TIME_LE(T1, T2) (EMACS_TIME_CMP (T1, T2) <= 0)
 
-#endif /* _SYSTIME_H */
+#endif /* EMACS_SYSTIME_H */
+
+/* arch-tag: dcb79915-cf99-4bce-9778-aade71d07651
+   (do not change this comment) */