Merge from trunk.

[gnu-emacs] / src / systime.h

diff --git a/src/systime.h b/src/systime.h
index bed9ed4aa7178374d74d575864d9e37b2af9cc91..9e7a1173a20dd06cf2eb23398171465c80e19a6b 100644 (file)
--- 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.
 
@@ -38,17 +38,6 @@ typedef unsigned long Time;
 # 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
-
 /* On some configurations (hpux8.0, X11R4), sys/time.h and X11/Xos.h
    disagree about the name of the guard symbol.  */
 #ifdef HPUX