diff --git a/CHANGES b/CHANGES index 81aad55382..f824108e5f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,10 @@ +4.1.0-dev.440 | 2021-03-30 14:57:07 -0700 + + * Fix incomplete-type for struct timeval (Andrew Benson) + + This fixes building on musl (e.g. Void, Alpine, etc.) + 4.1.0-dev.438 | 2021-03-29 15:42:25 -0700 * "balance" tests with multiple Zeek scripts to load the same elements (Vern Paxson, Corelight) diff --git a/VERSION b/VERSION index 812002b3ed..4a06c19f3c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.0-dev.438 +4.1.0-dev.440 diff --git a/src/util.cc b/src/util.cc index ce4f74cc0b..9c73c33deb 100644 --- a/src/util.cc +++ b/src/util.cc @@ -5,17 +5,6 @@ #include "zeek/util.h" -#ifdef TIME_WITH_SYS_TIME -# include -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - #ifdef HAVE_DARWIN #include #include diff --git a/src/util.h b/src/util.h index a4d5c6a524..4da4a10735 100644 --- a/src/util.h +++ b/src/util.h @@ -29,6 +29,17 @@ #include #include // std::unique_ptr +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif + #ifdef DEBUG #include