X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/44d5226a2cedb7e585fd6ab5290902c69154238a..94f0aa3464955865f5abdac6b335a86aca3e180a:/src/systime.h
diff --git a/src/systime.h b/src/systime.h
index ac28d883d6..9e7a1173a2 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -1,13 +1,12 @@
/* systime.h - System-dependent definitions for time manipulations.
- Copyright (C) 1993, 1994, 2002, 2003, 2004,
- 2005, 2006, 2007 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 2, 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
@@ -15,9 +14,7 @@ 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, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with GNU Emacs. If not, see . */
#ifndef EMACS_SYSTIME_H
#define EMACS_SYSTIME_H
@@ -33,21 +30,12 @@ Boston, MA 02110-1301, USA. */
#endif
#endif
-#ifdef HAVE_TZNAME
-#ifndef tzname /* For SGI. */
-extern char *tzname[]; /* RS6000 and others want it this way. */
-#endif
-#endif
-
-/* SVr4 doesn't actually declare this in its #include files. */
-#ifdef USG5_4
-extern time_t timezone;
-#endif
-
-#ifdef VMS
-#ifdef VAXC
-#include "vmstime.h"
-#endif
+#ifdef emacs
+# ifdef HAVE_X_WINDOWS
+# include
+# else
+typedef unsigned long Time;
+# endif
#endif
/* On some configurations (hpux8.0, X11R4), sys/time.h and X11/Xos.h
@@ -67,7 +55,7 @@ extern time_t 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.
@@ -83,7 +71,7 @@ extern time_t timezone;
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.
+ EMACS_TIME_NEG_P (TIME) is true if TIME is negative.
*/
@@ -144,26 +132,29 @@ 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 __P ((const char *, EMACS_TIME, EMACS_TIME));
+extern int set_file_times (const char *, EMACS_TIME, EMACS_TIME);
/* defined in keyboard.c */
-extern void set_waiting_for_input __P ((EMACS_TIME *));
+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 dired.c */
-extern Lisp_Object make_time __P ((time_t));
+/* 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. */
-
-#define EMACS_TIME_CMP(T1, T2) \
- (EMACS_SECS (T1) - EMACS_SECS (T2) \
- + (EMACS_SECS (T1) == EMACS_SECS (T2) \
- ? EMACS_USECS (T1) - EMACS_USECS (T2) \
+ 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_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))
/* Compare times T1 and T2 for equality, inequality etc. */
@@ -176,6 +167,3 @@ extern Lisp_Object make_time __P ((time_t));
#define EMACS_TIME_LE(T1, T2) (EMACS_TIME_CMP (T1, T2) <= 0)
#endif /* EMACS_SYSTIME_H */
-
-/* arch-tag: dcb79915-cf99-4bce-9778-aade71d07651
- (do not change this comment) */