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

Fixing some issues from rebasing

Browse source
This commit is contained in:
Tim Wojtulewicz 2022-10-24 15:20:54 -07:00 • committed by Tomer Lev
parent 45fa4c0dc4
commit 77c555a3a8
21 changed files with 85 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/zeek-setup.cc
View file

@ -52,7 +52,6 @@
#include "zeek/Traverse.h"
#include "zeek/Trigger.h"
#include "zeek/Var.h"
#include "zeek/analyzer/Manager.h"
#include "zeek/binpac_zeek.h"
#include "zeek/broker/Manager.h"
@ -67,7 +66,6 @@
#include "zeek/plugin/Manager.h"
#include "zeek/script_opt/ScriptOpt.h"
#include "zeek/session/Manager.h"
#include "zeek/script_opt/ScriptOpt.h"
#include "zeek/supervisor/Supervisor.h"
#include "zeek/telemetry/Manager.h"
#include "zeek/threading/Manager.h"
@ -210,6 +208,7 @@ char version[] = VERSION;
#else
extern char version[];
#endif
const char* zeek::detail::command_line_policy = nullptr;
vector<string> zeek::detail::params;
set<string> requested_plugins;
@ -245,9 +244,6 @@ char** zeek::detail::zeek_argv;
namespace zeek
{
// Define zeek version explicitly for MSVC
const char* zeek_version()
{
#ifdef DEBUG