* systime.h [_AIX]: Move test outside of previous #if.

	(EMACS_GET_TZ_OFFSET) [USG]: Don't declare twice.  Prefer tzset.

diff --git a/src/systime.h b/src/systime.h
index ab1d680..fdbb70a 100644 (file)
--- a/src/systime.h
+++ b/src/systime.h
@@ -33,13 +33,13 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <time.h>
 #endif /* _h_BSDTYPES */
 
+#endif
+
 /* AIX needs both <sys/time.h> and <time.h>.  */
 #ifdef _AIX
 #include <time.h>
 #endif
 
-#endif
-
 \f
 /* EMACS_TIME is the type to use to represent temporal intervals -
    struct timeval on some systems, int on others.  It can be passed as
@@ -184,8 +184,17 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef EMACS_CURRENT_TIME_ZONE
 
+/* System V derivatives have a timezone global variable.  */
+#ifdef USG
+#define EMACS_GET_TZ_OFFSET(offset)                                    \
+  do {                                                                 \
+    tzset ();                                                          \
+    *(offset) = timezone;                                              \
+  } while (0)
+#endif
+
 /* If we have timeval, then we have gettimeofday; that's half the battle.  */
-#ifdef HAVE_TIMEVAL
+#if defined (HAVE_TIMEVAL) && !defined (EMACS_GET_TZ_OFFSET)
 #define EMACS_GET_TZ_OFFSET(offset)                                    \
   do {                                                                 \
     struct timeval dummy;                                              \
@@ -196,15 +205,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
   } while (0)
 #endif /* ! defined (HAVE_TIMEVAL) */
 
-/* System V derivatives have a timezone global variable.  */
-#ifdef USG
-#define EMACS_GET_TZ_OFFSET(offset)                                    \
-  do {                                                                 \
-    tzset ();                                                          \
-    *(offset) = timezone;                                              \
-  } while (0)
-#endif
-
 /* The following sane systems have a tzname array.  The timezone() function
    is a stupid idea; timezone names can only be determined geographically,
    not by Greenwich offset.  */