Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-11 19:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/timw/fix-windows-build'

Browse source 
* origin/topic/timw/fix-windows-build:
  Fix linking of zeek_build_info on Windows
  CI: Enable Windows builds for PRs
  Call python explicitly from cmake for collecting repo info on Windows
  Rework zeek-inet-ntop snprintf return value handling
This commit is contained in:
Tim Wojtulewicz 2023-02-15 11:12:28 -07:00
commit 5ec72a7698
6 changed files with 32 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/zeek-setup.cc
View file

@ -202,12 +202,8 @@ std::shared_ptr<zeek::detail::SampleLogger> zeek::detail::sample_logger;
zeek::detail::FragmentManager* zeek::detail::fragment_mgr = nullptr;
int signal_val = 0;
#ifdef _MSC_VER
char version[] = VERSION;
#else
extern char version[];
#endif
extern const char zeek_build_info[];
extern "C" char version[];
extern "C" const char zeek_build_info[];
const char* zeek::detail::command_line_policy = nullptr;
vector<string> zeek::detail::params;