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

diff --git a/src/systime.h b/src/systime.h
index db43b26dc5..9e7a1173a2 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -1,5 +1,5 @@
 /* systime.h - System-dependent definitions for time manipulations.
-   Copyright (C) 1993-1994, 2002-2011 Free Software Foundation, Inc.
+   Copyright (C) 1993-1994, 2002-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -30,21 +30,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 #endif
 
-#ifdef HAVE_X_WINDOWS
-# include <X11/X.h>
-#else
+#ifdef emacs
+# ifdef HAVE_X_WINDOWS
+#  include <X11/X.h>
+# else
 typedef unsigned long Time;
-#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
 #endif
 
 /* On some configurations (hpux8.0, X11R4), sys/time.h and X11/Xos.h