Merge branch 'feature/ECKIT-613' into feature/actor

ecmwf · Aug 3, 2023 · 408e340 · 408e340
2 parents cd41368 + 967b6a0
commit 408e340
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/eckit/log/JSON.h b/src/eckit/log/JSON.h
@@ -15,6 +15,7 @@
 #ifndef eckit_log_JSON_h
 #define eckit_log_JSON_h
 
+#include <sys/time.h>
 #include <ctime>
 #include <iosfwd>
 #include <map>

diff --git a/src/eckit/system/SystemInfoFreeBSD.cc b/src/eckit/system/SystemInfoFreeBSD.cc
@@ -16,9 +16,9 @@
 #include <stdlib.h>
 
 #include <sys/resource.h>
-#include <sys/sysctl.h>
 #include <sys/time.h>
 #include <sys/types.h>  // FreeBSD: must appear before sys/sysctl.h
+#include <sys/sysctl.h>
 #include <unistd.h>
 
 #include <climits>