X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/0ed082fedf31241b54ef2294c29c4880a7472e0e..94f0aa3464955865f5abdac6b335a86aca3e180a:/src/systime.h
diff --git a/src/systime.h b/src/systime.h
index bd789e9bd3..9e7a1173a2 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -1,6 +1,5 @@
/* systime.h - System-dependent definitions for time manipulations.
- Copyright (C) 1993, 1994, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1993-1994, 2002-2012 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -31,15 +30,12 @@ along with GNU Emacs. If not, see . */
#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;
+#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
@@ -145,8 +141,9 @@ extern void set_waiting_for_input (EMACS_TIME *);
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 */
+/* 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.
@@ -170,6 +167,3 @@ extern Lisp_Object make_time (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) */