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

[slog] No longer use TIME_WITH_SYS_TIME

Browse source 
* configure.ac (struct tm.tm_gmtoff): Simplify conditional
preproc expression to not use ‘TIME_WITH_SYS_TIME’, and instead
#include <time.h> unconditionally.

* libguile/filesys.c: Simplify conditional preproc expression
to not use ‘TIME_WITH_SYS_TIME’, and instead #include <time.h>
unconditionally.
* libguile/posix.c: Likewise.
* libguile/gen-scmconfig.c: Likewise, for generation code.
This commit is contained in:
Thien-Thi Nguyen 2021-03-02 22:58:33 -05:00
parent 019675a3de
commit 5838f795dc
4 changed files with 7 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

9
configure.ac
View file

@ -1214,15 +1214,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

10
libguile/filesys.c
View file

@ -79,15 +79,9 @@ void *alloca (size_t);
#include <direct.h>
#endif
#ifdef TIME_WITH_SYS_TIME
#include <time.h>
#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
#ifdef HAVE_UNISTD_H

12
libguile/gen-scmconfig.c
View file

@ -151,18 +151,10 @@ main (int argc, char *argv[])
pf ("/* limits.h not available */\n");
#endif
# ifdef TIME_WITH_SYS_TIME
pf ("#include <sys/time.h>\n");
pf ("#include <time.h>\n");
# else
# ifdef HAVE_SYS_TIME_H
#ifdef HAVE_SYS_TIME_H
pf ("#include <sys/time.h>\n");
# else
# ifdef HAVE_TIME_H
pf ("#include <time.h>\n");
# endif
# endif
# endif
#endif
pf("\n");
#ifdef STDC_HEADERS

10
libguile/posix.c
View file

@ -46,15 +46,9 @@
#ifdef HAVE_STRING_H
#include <string.h>
#endif
#ifdef TIME_WITH_SYS_TIME
#include <time.h>
#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
#ifdef HAVE_UNISTD_H