Commit 98f77753 authored by Jim Blandy's avatar Jim Blandy
Browse files

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

	(EMACS_GET_TZ_OFFSET) [USG]: Don't declare twice.  Prefer tzset.
parent 31be8d24
......@@ -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
/* 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. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment