Initial revision.

[gnu-emacs] / src / systime.h

diff --git a/src/systime.h b/src/systime.h
index 3a85809fd91722181b73d43d93b0e9622d5b8ded..4e57cf8161db21a07d5c8e7e6a3025a2e6ad2927 100644 (file)
--- a/src/systime.h
+++ b/src/systime.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)

 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,


@@ -15,7 +15,11 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to

-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#ifndef EMACS_SYSTIME_H
+#define EMACS_SYSTIME_H

 
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>


@@ -36,7 +40,7 @@ extern char *tzname[];        /* RS6000 and others want it this way.  */
 
 /* SVr4 doesn't actually declare this in its #include files.  */
 #ifdef USG5_4
 
 /* SVr4 doesn't actually declare this in its #include files.  */
 #ifdef USG5_4

-extern long timezone;
+extern time_t timezone;

 #endif
 
 #ifdef VMS
 #endif
 
 #ifdef VMS


@@ -94,33 +98,35 @@ extern long timezone;
 
 /* On SVR4, the compiler may complain if given this extra BSD arg.  */
 #ifdef GETTIMEOFDAY_ONE_ARGUMENT
 
 /* On SVR4, the compiler may complain if given this extra BSD arg.  */
 #ifdef GETTIMEOFDAY_ONE_ARGUMENT

-#define EMACS_GET_TIME(time)                                  \
-{                                                             \
-  gettimeofday (&(time));                                     \
-}
+#define EMACS_GET_TIME(time) gettimeofday (&(time))

 #else /* not GETTIMEOFDAY_ONE_ARGUMENT */
 #else /* not GETTIMEOFDAY_ONE_ARGUMENT */

-#define EMACS_GET_TIME(time)                                   \
-{                                                              \
-  struct timezone dummy;                                       \
-  gettimeofday (&(time), &dummy);                              \
-}
+#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 */
 
 #endif /* not GETTIMEOFDAY_ONE_ARGUMENT */
 

-#define EMACS_ADD_TIME(dest, src1, src2)                       \
-{                                                              \
-  (dest).tv_sec  = (src1).tv_sec  + (src2).tv_sec;             \
-  (dest).tv_usec = (src1).tv_usec + (src2).tv_usec;            \
-  if ((dest).tv_usec > 1000000)                                        \
-    (dest).tv_usec -= 1000000, (dest).tv_sec++;                        \
-}
-
-#define EMACS_SUB_TIME(dest, src1, src2)                       \
-{                                                              \
-  (dest).tv_sec  = (src1).tv_sec  - (src2).tv_sec;             \
-  (dest).tv_usec = (src1).tv_usec - (src2).tv_usec;            \
-  if ((dest).tv_usec < 0)                                      \
-    (dest).tv_usec += 1000000, (dest).tv_sec--;                        \
-}
+#define EMACS_ADD_TIME(dest, src1, src2)               \
+  do {                                                 \
+    (dest).tv_sec  = (src1).tv_sec  + (src2).tv_sec;   \
+    (dest).tv_usec = (src1).tv_usec + (src2).tv_usec;  \
+    if ((dest).tv_usec > 1000000)                      \
+      (dest).tv_usec -= 1000000, (dest).tv_sec++;      \
+  } while (0)
+
+#define EMACS_SUB_TIME(dest, src1, src2)               \
+  do {                                                 \
+    (dest).tv_sec  = (src1).tv_sec  - (src2).tv_sec;   \
+    (dest).tv_usec = (src1).tv_usec - (src2).tv_usec;  \
+    if ((dest).tv_usec < 0)                            \
+      (dest).tv_usec += 1000000, (dest).tv_sec--;      \
+  } while (0)

 
 #define EMACS_TIME_NEG_P(time)                                 \
   ((long)(time).tv_sec < 0                                     \
 
 #define EMACS_TIME_NEG_P(time)                                 \
   ((long)(time).tv_sec < 0                                     \


@@ -145,4 +151,24 @@ extern long timezone;
 #define EMACS_SET_SECS_USECS(time, secs, usecs)                \
   (EMACS_SET_SECS (time, secs), EMACS_SET_USECS (time, usecs))
 
 #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 ((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.  */
+
+#define EMACS_TIME_CMP(T1, T2)                 \
+  (EMACS_SECS (T1) - EMACS_SECS (T2)           \
+   + (EMACS_SECS (T1) == EMACS_SECS (T2)       \
+      ? EMACS_USECS (T1) - EMACS_USECS (T2)    \
+      : 0))
+
+/* Compare times T1 and T2 for equality, inequality etc.  */
+
+#define EMACS_TIME_EQ(T1, T2) (EMACS_TIME_CMP (T1, T2) == 0)
+#define EMACS_TIME_NE(T1, T2) (EMACS_TIME_CMP (T1, T2) != 0)
+#define EMACS_TIME_GT(T1, T2) (EMACS_TIME_CMP (T1, T2) > 0)
+#define EMACS_TIME_GE(T1, T2) (EMACS_TIME_CMP (T1, T2) >= 0)
+#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 /* EMACS_SYSTIME_H */