From 36aa04ed121b09847f4141fe68797c8157aed737 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Fri, 19 Mar 2021 14:22:04 +0100 Subject: [PATCH] [time.h] time.h can be included unconditionally --- config2.h.in | 3 --- meson.build | 2 -- src/bfu/leds.c | 2 -- src/cookies/cookies.c | 2 -- src/dialogs/document.c | 2 -- src/globhist/globhist.c | 2 -- src/main/interlink.c | 2 -- src/protocol/date.c | 10 ---------- src/util/error.c | 2 -- src/util/file.c | 10 ---------- src/util/time.c | 2 -- src/util/time.h | 2 -- 12 files changed, 41 deletions(-) diff --git a/config2.h.in b/config2.h.in index 0b0bb9b8..1e793ac7 100644 --- a/config2.h.in +++ b/config2.h.in @@ -761,9 +761,6 @@ /* Define to 1 if you have the `timegm' function. */ #mesondefine HAVE_TIMEGM -/* Define to 1 if you have the header file. */ -#mesondefine HAVE_TIME_H - /* Define to 1 if you have the `tsearch' function. */ #mesondefine HAVE_TSEARCH diff --git a/meson.build b/meson.build index 702a0243..bb9330d2 100644 --- a/meson.build +++ b/meson.build @@ -152,7 +152,6 @@ conf_data.set10('HAVE_DIRENT_H', 1) # AC_HEADER_SYS_WAIT conf_data.set10('HAVE_SYS_WAIT_H', 1) # AC_HEADER_TIME -conf_data.set10('TIME_WITH_SYS_TIME', 1) conf_data.set10('HAVE_SYS_TIME_H', 1) compiler = meson.get_compiler('c') @@ -167,7 +166,6 @@ conf_data.set10('HAVE_WCHAR_H', compiler.has_header('wchar.h')) conf_data.set10('HAVE_WCTYPE_H', compiler.has_header('wctype.h')) conf_data.set10('HAVE_FCNTL_H', compiler.has_header('fcntl.h')) conf_data.set10('HAVE_LIMITS_H', compiler.has_header('limits.h')) -conf_data.set10('HAVE_TIME_H', compiler.has_header('time.h')) conf_data.set10('HAVE_UNISTD_H', compiler.has_header('unistd.h')) conf_data.set10('HAVE_SIGACTION_H', compiler.has_header('sigaction.h')) conf_data.set10('HAVE_ARPA_INET_H', compiler.has_header('arpa/inet.h')) diff --git a/src/bfu/leds.c b/src/bfu/leds.c index 7aee8e17..629de98f 100644 --- a/src/bfu/leds.c +++ b/src/bfu/leds.c @@ -10,9 +10,7 @@ #ifdef HAVE_SYS_TIME_H #include #endif -#ifdef HAVE_TIME_H #include -#endif #include "elinks.h" diff --git a/src/cookies/cookies.c b/src/cookies/cookies.c index 4a298105..8f1ce4f6 100644 --- a/src/cookies/cookies.c +++ b/src/cookies/cookies.c @@ -9,9 +9,7 @@ #include #include #include /* OS/2 needs this after sys/types.h */ -#ifdef HAVE_TIME_H #include -#endif #include "elinks.h" diff --git a/src/dialogs/document.c b/src/dialogs/document.c index da726ed2..a28ac0e4 100644 --- a/src/dialogs/document.c +++ b/src/dialogs/document.c @@ -7,9 +7,7 @@ #include #include #include -#ifdef HAVE_TIME_H #include -#endif #include "elinks.h" diff --git a/src/globhist/globhist.c b/src/globhist/globhist.c index 76e06469..941e2dfd 100644 --- a/src/globhist/globhist.c +++ b/src/globhist/globhist.c @@ -13,9 +13,7 @@ #include #include #include -#ifdef HAVE_TIME_H #include -#endif #include "bfu/dialog.h" #include "config/home.h" diff --git a/src/main/interlink.c b/src/main/interlink.c index c46e42c9..b3c6df05 100644 --- a/src/main/interlink.c +++ b/src/main/interlink.c @@ -16,9 +16,7 @@ #ifdef HAVE_SYS_TIME_H #include #endif -#ifdef HAVE_TIME_H #include -#endif /* Blame BSD for position of this includes. */ #ifdef HAVE_NETINET_IN_H diff --git a/src/protocol/date.c b/src/protocol/date.c index 408ef2db..136059aa 100644 --- a/src/protocol/date.c +++ b/src/protocol/date.c @@ -7,20 +7,10 @@ #include #include -#ifdef TIME_WITH_SYS_TIME #ifdef HAVE_SYS_TIME_H #include #endif -#ifdef HAVE_TIME_H #include -#endif -#else -#if defined(TM_IN_SYS_TIME) && defined(HAVE_SYS_TIME_H) -#include -#elif defined(HAVE_TIME_H) -#include -#endif -#endif #include "elinks.h" diff --git a/src/util/error.c b/src/util/error.c index b8e58344..95adbfeb 100644 --- a/src/util/error.c +++ b/src/util/error.c @@ -21,9 +21,7 @@ #ifdef HAVE_SYS_TIME_H #include #endif -#ifdef HAVE_TIME_H #include -#endif #include "elinks.h" diff --git a/src/util/file.c b/src/util/file.c index 92022e83..e4befc85 100644 --- a/src/util/file.c +++ b/src/util/file.c @@ -25,20 +25,10 @@ #include #endif -#ifdef TIME_WITH_SYS_TIME #ifdef HAVE_SYS_TIME_H #include #endif -#ifdef HAVE_TIME_H #include -#endif -#else -#if defined(TM_IN_SYS_TIME) && defined(HAVE_SYS_TIME_H) -#include -#elif defined(HAVE_TIME_H) -#include -#endif -#endif #include "elinks.h" diff --git a/src/util/time.c b/src/util/time.c index 5ef4b776..6f26c838 100644 --- a/src/util/time.c +++ b/src/util/time.c @@ -8,9 +8,7 @@ #ifdef HAVE_SYS_TIME_H #include #endif -#ifdef HAVE_TIME_H #include -#endif #include "elinks.h" diff --git a/src/util/time.h b/src/util/time.h index d2653aa8..6b695c33 100644 --- a/src/util/time.h +++ b/src/util/time.h @@ -7,9 +7,7 @@ #ifdef HAVE_SYS_TIME_H #include #endif -#ifdef HAVE_TIME_H #include -#endif #ifdef __cplusplus extern "C" {