Merge changes from emacs-23 branch.

[gnu-emacs] / src / systime.h

diff --git a/src/systime.h b/src/systime.h
index e9161114afda363e75cfeb4c6f4c973bb7e3c683..9f6a907a9c21bad82e107586d16817ae2bc763b1 100644 (file)
--- a/src/systime.h
+++ b/src/systime.h
@@ -1,6 +1,6 @@
 /* systime.h - System-dependent definitions for time manipulations.
    Copyright (C) 1993, 1994, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -42,12 +42,6 @@ extern char *tzname[];       /* RS6000 and others want it this way.  */
 extern time_t timezone;
 #endif
 
-#ifdef VMS
-#ifdef VAXC
-#include "vmstime.h"
-#endif
-#endif
-
 /* On some configurations (hpux8.0, X11R4), sys/time.h and X11/Xos.h
    disagree about the name of the guard symbol.  */
 #ifdef HPUX
@@ -142,26 +136,31 @@ 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));
+extern Lisp_Object make_time (time_t);
+
+/* defined in editfns.c*/
+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.  */