Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
* 'fix_timeval' of https://github.com/abenson/zeek:
  Fix incomplete-type for struct timeval
This commit is contained in:
Jon Siwek 2021-03-30 14:57:07 -07:00
commit 75ebc5bca1
4 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -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 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) * "balance" tests with multiple Zeek scripts to load the same elements (Vern Paxson, Corelight)

2
VERSION
View file

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

11
src/util.cc
View file

@ -5,17 +5,6 @@
#include "zeek/util.h" #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 #ifdef HAVE_DARWIN
#include <mach/task.h> #include <mach/task.h>
#include <mach/mach_init.h> #include <mach/mach_init.h>

11
src/util.h
View file

@ -29,6 +29,17 @@
#include <vector> #include <vector>
#include <memory> // std::unique_ptr #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 #ifdef DEBUG
#include <assert.h> #include <assert.h>