X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/fb1b041d1e02fe6a457df6c4cdd3284e1c4b8a1e..94f0aa3464955865f5abdac6b335a86aca3e180a:/src/systime.h

diff --git a/src/systime.h b/src/systime.h
index 59fc8a9628..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, 1994 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
@@ -14,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., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_SYSTIME_H
 #define EMACS_SYSTIME_H
@@ -32,21 +30,12 @@ Boston, MA 02111-1307, 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 <X11/X.h>
+# else
+typedef unsigned long Time;
+# endif
 #endif
 
 /* On some configurations (hpux8.0, X11R4), sys/time.h and X11/Xos.h
@@ -66,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.
@@ -81,8 +70,8 @@ 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. 
-   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.
 
 */
 
@@ -100,11 +89,8 @@ extern time_t timezone;
 #ifdef GETTIMEOFDAY_ONE_ARGUMENT
 #define EMACS_GET_TIME(time) gettimeofday (&(time))
 #else /* not GETTIMEOFDAY_ONE_ARGUMENT */
-#define EMACS_GET_TIME(time)			\
-  do {						\
-    struct timezone dummy;			\
-    gettimeofday (&(time), &dummy);		\
-  } while (0)
+/* 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)		\
@@ -146,15 +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 ();
+extern int set_file_times (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.  */
+/* defined in keyboard.c */
+extern void set_waiting_for_input (EMACS_TIME *);
 
-#define EMACS_TIME_CMP(T1, T2)			\
-  (EMACS_SECS (T1) - EMACS_SECS (T2)		\
-   + (EMACS_SECS (T1) == EMACS_SECS (T2)	\
-      ? EMACS_USECS (T1) - EMACS_USECS (T2)	\
+/* 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_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.  */