diff options
| author | Mike Gran <spk121@yahoo.com> | 2022-09-15 03:55:17 -0700 |
|---|---|---|
| committer | Mike Gran <spk121@yahoo.com> | 2022-10-14 08:40:23 -0700 |
| commit | df8e772f3c5f8c998b074a2821320544da8fb088 (patch) | |
| tree | 94069ddb3e920c4a058d0fe5be8a96faca791b23 | |
| parent | 3827291425de2cd22ba8026ff8ad08ef64ef8269 (diff) | |
| download | guile-df8e772f3c5f8c998b074a2821320544da8fb088.tar.gz | |
Presume time.h and sys/time.h don't conflict when included
Systems on which time.h and sys/time.h conflicted are obsolescent.
* configure.ac: remove AC_HEADER_TIME. remove conditional
in tm.tm_gmtoff test.
* libguile/filesys.c [TIME_WITH_SYS_TIME]: remove conditional
* libguile/posix.c [TIME_WITH_SYS_TIME]: remove conditional
# Conflicts:
# libguile/filesys.c
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | libguile/filesys.c | 10 | ||||
| -rw-r--r-- | libguile/posix.c | 10 |
3 files changed, 5 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac index ac2f91f57..adeb12f7b 100644 --- a/configure.ac +++ b/configure.ac @@ -376,7 +376,6 @@ esac AC_MSG_RESULT($SCM_PREBUILT_BINARIES) AC_SUBST([SCM_PREBUILT_BINARIES]) -AC_HEADER_TIME AC_HEADER_SYS_WAIT AC_HEADER_DIRENT @@ -1013,15 +1012,8 @@ AC_CHECK_MEMBERS([struct stat.st_rdev, struct stat.st_blksize, struct stat.st_bl AC_STRUCT_TIMEZONE AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,, [#include <time.h> -#ifdef TIME_WITH_SYS_TIME +#if HAVE_SYS_TIME_H # include <sys/time.h> -# include <time.h> -#else -# if HAVE_SYS_TIME_H -# include <sys/time.h> -# else -# include <time.h> -# endif #endif ]) GUILE_STRUCT_UTIMBUF diff --git a/libguile/filesys.c b/libguile/filesys.c index f182f6c79..234f70f77 100644 --- a/libguile/filesys.c +++ b/libguile/filesys.c @@ -53,16 +53,10 @@ #include <io.h> #endif -#ifdef TIME_WITH_SYS_TIME +#if HAVE_SYS_TIME_H # include <sys/time.h> -# include <time.h> -#else -# if HAVE_SYS_TIME_H -# include <sys/time.h> -# else -# include <time.h> -# endif #endif +#include <time.h> #ifdef LIBC_H_WITH_UNISTD_H #include <libc.h> diff --git a/libguile/posix.c b/libguile/posix.c index 8471818ad..1b8dbd0e4 100644 --- a/libguile/posix.c +++ b/libguile/posix.c @@ -37,16 +37,10 @@ # include <sched.h> #endif -#ifdef TIME_WITH_SYS_TIME +#if HAVE_SYS_TIME_H # include <sys/time.h> -# include <time.h> -#else -# if HAVE_SYS_TIME_H -# include <sys/time.h> -# else -# include <time.h> -# endif #endif +#include <time.h> #ifdef LIBC_H_WITH_UNISTD_H # include <libc.h> |