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

Merge remote-tracking branch 'origin/master' into topic/johanna/243

Browse source
This commit is contained in:
Johanna Amann 2019-05-20 10:14:11 -07:00
commit 824ccde6fc
1222 changed files with 2435 additions and 2096 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/logging/Tag.h
View file

@ -3,7 +3,7 @@
#ifndef LOGGING_TAG_H
#define LOGGING_TAG_H
#include "bro-config.h"
#include "zeek-config.h"
#include "util.h"
#include "../Tag.h"
#include "plugin/TaggedComponent.h"

2
src/logging/writers/sqlite/SQLite.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h"
#include "zeek-config.h"
#include <string>
#include <errno.h>

2
src/logging/writers/sqlite/SQLite.h
View file

@ -5,7 +5,7 @@
#ifndef LOGGING_WRITER_SQLITE_H
#define LOGGING_WRITER_SQLITE_H
#include "bro-config.h"
#include "zeek-config.h"
#include "logging/WriterBackend.h"
#include "threading/formatters/Ascii.h"