diff options
| author | Campus <fci1908@gmail.com> | 2018-08-23 12:01:14 +0200 |
|---|---|---|
| committer | Campus <fci1908@gmail.com> | 2018-08-23 12:01:14 +0200 |
| commit | 2b9b996148aca75f9fa88fb6172ae657fc43a445 (patch) | |
| tree | 3a4d7caad20f45fe55e05f8f0d2fe159ad8d4c51 | |
| parent | 48f3104774b2c7f32fe29011c8739ba5c4450a23 (diff) | |
| parent | 06befec642103bb4b20be3ac9227fe42d92fde1b (diff) | |
Merge branch 'pr-remove-autoconf-include' of https://github.com/eglooca/ndpi-pr into eglooca-pr-remove-autoconf-include
| -rw-r--r-- | src/include/ndpi_typedefs.h | 11 | ||||
| -rw-r--r-- | src/lib/ndpi_main.c | 8 |
2 files changed, 6 insertions, 13 deletions
diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index cd1c7b925..a3ed39c2d 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -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 { diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 55af168e8..2a51316fa 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -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; |