From 046401cbd87d6ee9307a24aa0bd068aaf1cc4b29 Mon Sep 17 00:00:00 2001 From: "Darryl L. Miles" Date: Sat, 12 Oct 2024 13:57:08 +0100 Subject: [PATCH] Use HAVE_SYS_TIME_H and TIME_WITH_SYS_TIME from autoconf where possible --- calma/CalmaWrite.c | 12 +++++++++--- calma/CalmaWriteZ.c | 11 ++++++++--- database/DBio.c | 12 ++++++++++-- extract/ExtSubtree.c | 2 ++ extract/ExtTimes.c | 2 ++ graphics/X11Helper.c | 2 ++ graphics/grMain.c | 2 ++ lef/lefRead.c | 2 ++ plow/PlowMain.c | 2 ++ router/rtrMain.c | 2 ++ textio/txCommands.c | 12 ++++++++++-- textio/txInput.c | 2 ++ utils/main.c | 2 ++ utils/runstats.c | 2 ++ utils/signals.c | 2 ++ windows/windCmdAM.c | 2 ++ windows/windCmdNR.c | 2 ++ 17 files changed, 63 insertions(+), 10 deletions(-) diff --git a/calma/CalmaWrite.c b/calma/CalmaWrite.c index d2c223d0..749d1bce 100644 --- a/calma/CalmaWrite.c +++ b/calma/CalmaWrite.c @@ -28,9 +28,15 @@ static const char rcsid[] __attribute__ ((unused)) ="$Header: /usr/cvsroot/magic #include #include #include /* for htons() */ -#include /* since C89 */ -#ifdef HAVE_SYS_TIME_H -#include +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif #endif #include "utils/magic.h" diff --git a/calma/CalmaWriteZ.c b/calma/CalmaWriteZ.c index 442445d4..886743db 100644 --- a/calma/CalmaWriteZ.c +++ b/calma/CalmaWriteZ.c @@ -38,10 +38,15 @@ static const char rcsid[] __attribute__ ((unused)) ="$Header: /usr/cvsroot/magic #include #include #include /* for htons() */ -#if defined(SYSV) || defined(EMSCRIPTEN) -#include +#ifdef TIME_WITH_SYS_TIME +# include +# include #else -#include +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif #endif #include "utils/magic.h" diff --git a/database/DBio.c b/database/DBio.c index 20cc76ef..bf5238c5 100644 --- a/database/DBio.c +++ b/database/DBio.c @@ -40,8 +40,16 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/ #endif #include -#include -#include +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif #ifdef HAVE_PATHS_H #include diff --git a/extract/ExtSubtree.c b/extract/ExtSubtree.c index bf7d89dd..d9a23752 100644 --- a/extract/ExtSubtree.c +++ b/extract/ExtSubtree.c @@ -28,7 +28,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/ #include #include +#ifdef HAVE_SYS_TIME_H #include +#endif #include "tcltk/tclmagic.h" #include "utils/magic.h" diff --git a/extract/ExtTimes.c b/extract/ExtTimes.c index 7d3a6431..3cdaf178 100644 --- a/extract/ExtTimes.c +++ b/extract/ExtTimes.c @@ -23,7 +23,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/ #include #include #include +#ifdef HAVE_SYS_TIME_H #include +#endif #include #if defined(SYSV) || defined(EMSCRIPTEN) #include diff --git a/graphics/X11Helper.c b/graphics/X11Helper.c index cf0de41f..6c601ef4 100644 --- a/graphics/X11Helper.c +++ b/graphics/X11Helper.c @@ -14,7 +14,9 @@ #include #include #include +#ifdef HAVE_SYS_TIME_H #include +#endif #include #include #include diff --git a/graphics/grMain.c b/graphics/grMain.c index 2e465297..404b4e30 100644 --- a/graphics/grMain.c +++ b/graphics/grMain.c @@ -53,7 +53,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/ #include #include #include +#ifdef HAVE_SYS_TIME_H #include +#endif #include #include diff --git a/lef/lefRead.c b/lef/lefRead.c index df5c2ab6..0626a47d 100644 --- a/lef/lefRead.c +++ b/lef/lefRead.c @@ -24,7 +24,9 @@ static const char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magi #include #include #include +#ifdef HAVE_SYS_TIME_H #include +#endif #include /* for roundf() function, if std=c99 */ #include "tcltk/tclmagic.h" diff --git a/plow/PlowMain.c b/plow/PlowMain.c index 1ec402fe..b854e1bb 100644 --- a/plow/PlowMain.c +++ b/plow/PlowMain.c @@ -24,7 +24,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/ #include #include +#ifdef HAVE_SYS_TIME_H #include +#endif #include #include "utils/magic.h" diff --git a/router/rtrMain.c b/router/rtrMain.c index 73db9a2c..32860d80 100644 --- a/router/rtrMain.c +++ b/router/rtrMain.c @@ -20,7 +20,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/ #endif /* not lint */ #include +#ifdef HAVE_SYS_TIME_H #include +#endif #include #include #include diff --git a/textio/txCommands.c b/textio/txCommands.c index 33c8ebdf..15ec17c3 100644 --- a/textio/txCommands.c +++ b/textio/txCommands.c @@ -26,9 +26,17 @@ static char rcsid[] __attribute__ ((unused)) ="$Header: /usr/cvsroot/magic-8.0/t #include #include #include -#include #include -#include +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif #include "tcltk/tclmagic.h" #include "utils/magsgtty.h" diff --git a/textio/txInput.c b/textio/txInput.c index 0e84a62a..1955daf6 100644 --- a/textio/txInput.c +++ b/textio/txInput.c @@ -23,7 +23,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/ #include #include #include +#ifdef HAVE_SYS_TIME_H #include +#endif #include #include #include diff --git a/utils/main.c b/utils/main.c index 4f6b15b2..7efa550a 100644 --- a/utils/main.c +++ b/utils/main.c @@ -29,7 +29,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/ #include #include +#ifdef HAVE_SYS_TIME_H #include +#endif #include "tcltk/tclmagic.h" #include "utils/main.h" diff --git a/utils/runstats.c b/utils/runstats.c index 52137ce0..f8323ec6 100644 --- a/utils/runstats.c +++ b/utils/runstats.c @@ -24,7 +24,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/ #include #include +#ifdef HAVE_SYS_TIME_H #include +#endif #include #include diff --git a/utils/signals.c b/utils/signals.c index e334a47e..16ed2599 100644 --- a/utils/signals.c +++ b/utils/signals.c @@ -25,7 +25,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/ #include #include #include /* for getpid() */ +#ifdef HAVE_SYS_TIME_H #include +#endif #include #include "tcltk/tclmagic.h" diff --git a/windows/windCmdAM.c b/windows/windCmdAM.c index e0120aef..b1a57b99 100644 --- a/windows/windCmdAM.c +++ b/windows/windCmdAM.c @@ -23,7 +23,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/ #include #include #include +#ifdef HAVE_SYS_TIME_H #include +#endif #include #include #include diff --git a/windows/windCmdNR.c b/windows/windCmdNR.c index 02ed967f..3237a54c 100644 --- a/windows/windCmdNR.c +++ b/windows/windCmdNR.c @@ -23,7 +23,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/ #include #include #include +#ifdef HAVE_SYS_TIME_H #include +#endif #include #include