X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/cf4138adefc2a82ddda665abd0c2a94840718f92..94f0aa3464955865f5abdac6b335a86aca3e180a:/src/systime.h
diff --git a/src/systime.h b/src/systime.h
index 71e238e4ce..9e7a1173a2 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -1,12 +1,12 @@
/* systime.h - System-dependent definitions for time manipulations.
- Copyright (C) 1993 Free Software Foundation, Inc.
+ Copyright (C) 1993-1994, 2002-2012 Free Software Foundation, Inc.
This file is part of GNU Emacs.
-GNU Emacs is free software; you can redistribute it and/or modify
+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)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+along with GNU Emacs. If not, see . */
+
+#ifndef EMACS_SYSTIME_H
+#define EMACS_SYSTIME_H
#ifdef TIME_WITH_SYS_TIME
#include
@@ -28,23 +30,23 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#endif
#endif
-#ifdef HAVE_TZNAME
-#ifndef tzname /* For SGI. */
-extern char *tzname[]; /* RS6000 and others want it this way. */
-#endif
+#ifdef emacs
+# ifdef HAVE_X_WINDOWS
+# include
+# else
+typedef unsigned long Time;
+# endif
#endif
-/* SVr4 doesn't actually declare this in its #include files. */
-#ifdef USG5_4
-extern long timezone;
+/* On some configurations (hpux8.0, X11R4), sys/time.h and X11/Xos.h
+ disagree about the name of the guard symbol. */
+#ifdef HPUX
+#ifdef _STRUCT_TIMEVAL
+#ifndef __TIMEVAL__
+#define __TIMEVAL__
#endif
-
-#ifdef VMS
-#ifdef VAXC
-#include "vmstime.h"
#endif
#endif
-
/* EMACS_TIME is the type to use to represent temporal intervals -
struct timeval on some systems, int on others. It can be passed as
@@ -53,7 +55,7 @@ extern long timezone;
EMACS_SECS (TIME) is an rvalue for the seconds component of TIME.
EMACS_SET_SECS (TIME, SECONDS) sets that to SECONDS.
- EMACS_HAS_USECS is defined iff EMACS_TIME has a usecs component.
+ EMACS_HAS_USECS is defined if EMACS_TIME has a usecs component.
EMACS_USECS (TIME) is an rvalue for the microseconds component of TIME.
This returns zero if EMACS_TIME doesn't have a microseconds component.
EMACS_SET_USECS (TIME, MICROSECONDS) sets that to MICROSECONDS.
@@ -63,16 +65,13 @@ extern long timezone;
EMACS_GET_TIME (TIME) stores the current system time in TIME, which
should be an lvalue.
- EMACS_SET_UTIMES (PATH, ATIME, MTIME) changes the last-access and
- last-modification times of the file named PATH to ATIME and
- MTIME, which are EMACS_TIMEs.
EMACS_ADD_TIME (DEST, SRC1, SRC2) adds SRC1 to SRC2 and stores the
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.
- EMACS_TIME_NEG_P (TIME) is true iff TIME is negative.
+ stores the result in DEST. SRC should not be negative.
+ EMACS_TIME_NEG_P (TIME) is true if TIME is negative.
*/
@@ -87,34 +86,28 @@ extern long timezone;
#define EMACS_SET_USECS(time, microseconds) ((time).tv_usec = (microseconds))
/* On SVR4, the compiler may complain if given this extra BSD arg. */
-#ifdef USG5_4
-#define EMACS_GET_TIME(time) \
-{ \
- gettimeofday (&(time)); \
-}
-#else /* not USG5_4 */
-#define EMACS_GET_TIME(time) \
-{ \
- struct timezone dummy; \
- gettimeofday (&(time), &dummy); \
-}
-#endif /* not USG5_4 */
-
-#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--; \
-}
+#ifdef GETTIMEOFDAY_ONE_ARGUMENT
+#define EMACS_GET_TIME(time) gettimeofday (&(time))
+#else /* not GETTIMEOFDAY_ONE_ARGUMENT */
+/* Presumably the second arg is ignored. */
+#define EMACS_GET_TIME(time) gettimeofday (&(time), NULL)
+#endif /* not GETTIMEOFDAY_ONE_ARGUMENT */
+
+#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 \
@@ -139,24 +132,38 @@ extern long timezone;
#define EMACS_SET_SECS_USECS(time, secs, usecs) \
(EMACS_SET_SECS (time, secs), EMACS_SET_USECS (time, usecs))
-#ifdef USE_UTIME
+extern int set_file_times (const char *, EMACS_TIME, EMACS_TIME);
+
+/* defined in keyboard.c */
+extern void set_waiting_for_input (EMACS_TIME *);
+
+/* When lisp.h is not included Lisp_Object is not defined (this can
+ happen when this files is used outside the src directory).
+ Use GCPRO1 to determine if lisp.h was included. */
+#ifdef GCPRO1
+/* defined in editfns.c*/
+extern Lisp_Object make_time (time_t);
+extern int lisp_time_argument (Lisp_Object, time_t *, int *);
+#endif
+
+/* 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. (Cast
+ to long is for those platforms where time_t is an unsigned
+ type, and where otherwise T1 will always be grater than T2.) */
-#define EMACS_SET_UTIMES(path, atime, mtime) \
- { \
- time_t tv[2]; \
- tv[0] = EMACS_SECS (atime); \
- tv[1] = EMACS_SECS (mtime); \
- utime ((path), tv); \
- }
+#define EMACS_TIME_CMP(T1, T2) \
+ ((long)EMACS_SECS (T1) - (long)EMACS_SECS (T2) \
+ + (EMACS_SECS (T1) == EMACS_SECS (T2) \
+ ? EMACS_USECS (T1) - EMACS_USECS (T2) \
+ : 0))
-#else /* ! defined (USE_UTIME) */
+/* Compare times T1 and T2 for equality, inequality etc. */
-#define EMACS_SET_UTIMES(path, atime, mtime) \
- { \
- EMACS_TIME tv[2]; \
- tv[0] = atime; \
- tv[1] = mtime; \
- utimes ((path), tv); \
- }
+#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 /* ! defined (USE_UTIME) */
+#endif /* EMACS_SYSTIME_H */