pcre2: move header include to suricata-common only

pull/6414/head
Philippe Antoine 4 years ago
parent fae7389ae2
commit 2a1690e110

@ -38,7 +38,6 @@
#include "detect-tcp-flags.h" #include "detect-tcp-flags.h"
#include "feature.h" #include "feature.h"
#include "util-print.h" #include "util-print.h"
#include <pcre2.h>
static int rule_warnings_only = 0; static int rule_warnings_only = 0;
static FILE *rule_engine_analysis_FD = NULL; static FILE *rule_engine_analysis_FD = NULL;

@ -45,8 +45,6 @@ typedef struct DetectParseRegex_ {
struct DetectParseRegex_ *next; struct DetectParseRegex_ *next;
} DetectParseRegex; } DetectParseRegex;
#include <pcre2.h>
typedef struct DetectParseRegex2 { typedef struct DetectParseRegex2 {
pcre2_code *regex; pcre2_code *regex;
pcre2_match_context *context; pcre2_match_context *context;

@ -25,7 +25,6 @@
#include "suricata-common.h" #include "suricata-common.h"
#include <pcre2.h>
#include "detect.h" #include "detect.h"
#include "detect-engine.h" #include "detect-engine.h"
#include "detect-parse.h" #include "detect-parse.h"

@ -58,7 +58,6 @@
#include "util-misc.h" #include "util-misc.h"
#include "util-cpu.h" #include "util-cpu.h"
#include "util-atomic.h" #include "util-atomic.h"
#include <pcre2.h>
#include "source-pcap.h" #include "source-pcap.h"

@ -139,6 +139,7 @@ typedef unsigned char u_char
#endif #endif
#include <pcre.h> #include <pcre.h>
#include <pcre2.h>
#ifdef HAVE_SYSLOG_H #ifdef HAVE_SYSLOG_H
#include <syslog.h> #include <syslog.h>

@ -35,7 +35,6 @@
#include "util-debug.h" #include "util-debug.h"
#include "util-fmemopen.h" #include "util-fmemopen.h"
#include "util-byte.h" #include "util-byte.h"
#include <pcre2.h>
/* Regex to parse the classtype argument from a Signature. The first substring /* Regex to parse the classtype argument from a Signature. The first substring
* holds the classtype name, the second substring holds the classtype the * holds the classtype name, the second substring holds the classtype the

@ -31,7 +31,6 @@
#include "util-error.h" #include "util-error.h"
#include "util-debug-filters.h" #include "util-debug-filters.h"
#include "util-atomic.h" #include "util-atomic.h"
#include <pcre2.h>
/** /**
* \brief ENV vars that can be used to set the properties for the logging module * \brief ENV vars that can be used to set the properties for the logging module

@ -27,7 +27,6 @@
#include "suricata-common.h" #include "suricata-common.h"
#include "util-host-info.h" #include "util-host-info.h"
#include "util-byte.h" #include "util-byte.h"
#include <pcre2.h>
#ifndef OS_WIN32 #ifndef OS_WIN32
#include <sys/utsname.h> #include <sys/utsname.h>

@ -27,7 +27,6 @@
#include "util-debug.h" #include "util-debug.h"
#include "util-unittest.h" #include "util-unittest.h"
#include "util-misc.h" #include "util-misc.h"
#include <pcre2.h>
#define PARSE_REGEX "^\\s*(\\d+(?:.\\d+)?)\\s*([a-zA-Z]{2})?\\s*$" #define PARSE_REGEX "^\\s*(\\d+(?:.\\d+)?)\\s*([a-zA-Z]{2})?\\s*$"
static pcre2_code *parse_regex = NULL; static pcre2_code *parse_regex = NULL;

@ -25,7 +25,6 @@
#include "detect.h" #include "detect.h"
#include "detect-engine.h" #include "detect-engine.h"
#include "util-hash.h" #include "util-hash.h"
#include <pcre2.h>
#include "util-reference-config.h" #include "util-reference-config.h"
#include "conf.h" #include "conf.h"

@ -38,7 +38,6 @@
#include "util-debug.h" #include "util-debug.h"
#include "util-time.h" #include "util-time.h"
#include "conf.h" #include "conf.h"
#include <pcre2.h>
#include "stream-tcp.h" #include "stream-tcp.h"
#include "stream-tcp-reassemble.h" #include "stream-tcp-reassemble.h"

Loading…
Cancel
Save