[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] branch branch_release-1-8 updated: [slog] No longer use
From: |
Thien-Thi Nguyen |
Subject: |
[Guile-commits] branch branch_release-1-8 updated: [slog] No longer use TIME_WITH_SYS_TIME |
Date: |
Tue, 02 Mar 2021 23:01:32 -0500 |
This is an automated email from the git hooks/post-receive script.
ttn pushed a commit to branch branch_release-1-8
in repository guile.
The following commit(s) were added to refs/heads/branch_release-1-8 by this
push:
new 5838f79 [slog] No longer use TIME_WITH_SYS_TIME
5838f79 is described below
commit 5838f795dcf00e4e1a5d457b95b96e1244cf732b
Author: Thien-Thi Nguyen <ttn@gnu.org>
AuthorDate: Tue Mar 2 22:58:33 2021 -0500
[slog] No longer use TIME_WITH_SYS_TIME
* 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.
---
configure.ac | 9 +--------
libguile/filesys.c | 10 ++--------
libguile/gen-scmconfig.c | 12 ++----------
libguile/posix.c | 10 ++--------
4 files changed, 7 insertions(+), 34 deletions(-)
diff --git a/configure.ac b/configure.ac
index e8305fe..b2f6233 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/libguile/filesys.c b/libguile/filesys.c
index c76f407..f420b95 100644
--- a/libguile/filesys.c
+++ b/libguile/filesys.c
@@ -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
diff --git a/libguile/gen-scmconfig.c b/libguile/gen-scmconfig.c
index c94f390..f02f918 100644
--- a/libguile/gen-scmconfig.c
+++ b/libguile/gen-scmconfig.c
@@ -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
diff --git a/libguile/posix.c b/libguile/posix.c
index 9e32feb..7abc91c 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Guile-commits] branch branch_release-1-8 updated: [slog] No longer use TIME_WITH_SYS_TIME,
Thien-Thi Nguyen <=