Merge branch 'fix_timeval' of https://github.com/abenson/zeek

* 'fix_timeval' of https://github.com/abenson/zeek:
  Fix incomplete-type for struct timeval

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)

VERSION

@@ -1 +1 @@
-4.1.0-dev.438
+4.1.0-dev.440

src/util.cc

@@ -5,17 +5,6 @@
 
 #include "zeek/util.h"
 
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
 #ifdef HAVE_DARWIN
 #include <mach/task.h>
 #include <mach/mach_init.h>

src/util.h

@@ -29,6 +29,17 @@
 #include <vector>
 #include <memory> // std::unique_ptr
 
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# ifdef HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #ifdef DEBUG
 
 #include <assert.h>