*** empty log message ***

[gnu-emacs] / src / systime.h

diff --git a/src/systime.h b/src/systime.h
index 2f9ace521e2ea7dae3a5acee6a08d1f6076fd2c0..00373b257b3f1e64bd2bfee972575b6885a2a716 100644 (file)
--- a/src/systime.h
+++ b/src/systime.h
@@ -1,5 +1,6 @@
 /* systime.h - System-dependent definitions for time manipulations.
-   Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2002, 2003, 2004,
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,11 +16,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
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
-#ifndef _SYSTIME_H
-#define _SYSTIME_H
+#ifndef EMACS_SYSTIME_H
+#define EMACS_SYSTIME_H
 
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -81,7 +82,7 @@ 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. 
+       stores the result in DEST.  SRC should not be negative.
    EMACS_TIME_NEG_P (TIME) is true iff TIME is negative.
 
 */
@@ -100,11 +101,16 @@ extern time_t timezone;
 #ifdef GETTIMEOFDAY_ONE_ARGUMENT
 #define EMACS_GET_TIME(time) gettimeofday (&(time))
 #else /* not GETTIMEOFDAY_ONE_ARGUMENT */
+#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 */
 
 #define EMACS_ADD_TIME(dest, src1, src2)               \
@@ -146,7 +152,18 @@ 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 __P ((const char *, EMACS_TIME, EMACS_TIME));
+
+/* defined in keyboard.c */
+extern void set_waiting_for_input __P ((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));
+#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.  */
@@ -166,4 +183,7 @@ extern int set_file_times ();
 #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 /* _SYSTIME_H */
+#endif /* EMACS_SYSTIME_H */
+
+/* arch-tag: dcb79915-cf99-4bce-9778-aade71d07651
+   (do not change this comment) */