Merge branch 'pr-remove-autoconf-include' of https://github.com/eglooca/ndpi-pr into eglooca-pr-remove-autoconf-include

This commit is contained in:
Campus
2018-08-23 12:01:14 +02:00
2 changed files with 6 additions and 13 deletions
-11
View File
@@ -27,9 +27,6 @@
#include "ndpi_define.h"
#include "ndpi_protocol_ids.h"
/* Needed to have access to HAVE_* defines */
#include "ndpi_config.h"
/* NDPI_LOG_LEVEL */
typedef enum {
NDPI_LOG_ERROR,
@@ -855,14 +852,6 @@ typedef struct ndpi_proto {
#define NUM_CUSTOM_CATEGORIES 5
#define CUSTOM_CATEGORY_LABEL_LEN 32
#ifdef HAVE_HYPERSCAN
struct hs_list {
char *expression;
unsigned int id;
struct hs_list *next;
};
#endif
#ifdef NDPI_LIB_COMPILATION
struct ndpi_detection_module_struct {
+6 -2
View File
@@ -49,9 +49,13 @@
#ifdef HAVE_HYPERSCAN
#include <hs/hs.h>
#endif
#ifdef HAVE_HYPERSCAN
struct hs_list {
char *expression;
unsigned int id;
struct hs_list *next;
};
struct hs {
hs_database_t *database;
hs_scratch_t *scratch;