mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-30 06:50:31 +02:00
Code Activity

Presume time.h and sys/time.h don't conflict when included

Browse source 
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
This commit is contained in:
Mike Gran 2022-09-15 03:55:17 -07:00
parent 3827291425
commit df8e772f3c
3 changed files with 5 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
configure.ac
View file

@ -376,7 +376,6 @@ esac
AC_MSG_RESULT($SCM_PREBUILT_BINARIES) AC_MSG_RESULT($SCM_PREBUILT_BINARIES)
AC_SUBST([SCM_PREBUILT_BINARIES]) AC_SUBST([SCM_PREBUILT_BINARIES])
AC_HEADER_TIME
AC_HEADER_SYS_WAIT AC_HEADER_SYS_WAIT
AC_HEADER_DIRENT 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_STRUCT_TIMEZONE
AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,, AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,
[#include <time.h> [#include <time.h>
#ifdef TIME_WITH_SYS_TIME #if HAVE_SYS_TIME_H
# include <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 #endif
]) ])
GUILE_STRUCT_UTIMBUF GUILE_STRUCT_UTIMBUF

10
libguile/filesys.c
View file

@ -53,16 +53,10 @@
#include <io.h> #include <io.h>
#endif #endif
#ifdef TIME_WITH_SYS_TIME #if HAVE_SYS_TIME_H
# include <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 #endif
#include <time.h>
#ifdef LIBC_H_WITH_UNISTD_H #ifdef LIBC_H_WITH_UNISTD_H
#include <libc.h> #include <libc.h>

10
libguile/posix.c
View file

@ -37,16 +37,10 @@
# include <sched.h> # include <sched.h>
#endif #endif
#ifdef TIME_WITH_SYS_TIME #if HAVE_SYS_TIME_H
# include <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 #endif
#include <time.h>
#ifdef LIBC_H_WITH_UNISTD_H #ifdef LIBC_H_WITH_UNISTD_H
# include <libc.h> # include <libc.h>