aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampus <campus@ntop.org>2018-04-26 11:43:59 +0200
committerCampus <campus@ntop.org>2018-04-26 11:43:59 +0200
commit23042b3c9ade1e1ca7d5a0a5a69403c1d6e5a503 (patch)
tree4f66ed6941adbb870de7fdf5981d305df07ae146
parentb92541a08e64ea1d4295f1469f3df070929bc853 (diff)
parente819899221477b23f24b1fb57141f3c93f3d2305 (diff)
Merge branch 'dsokoloski-pr-autoconf-config-include-fix' into dev
-rw-r--r--example/ndpiReader.c4
-rw-r--r--example/ndpi_util.c4
-rw-r--r--src/include/ndpi_main.h1
-rw-r--r--src/lib/ndpi_main.c4
4 files changed, 12 insertions, 1 deletions
diff --git a/example/ndpiReader.c b/example/ndpiReader.c
index ddd83bb74..6a4c31ade 100644
--- a/example/ndpiReader.c
+++ b/example/ndpiReader.c
@@ -18,6 +18,10 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include "ndpi_config.h"
+#endif
+
#ifdef linux
#define _GNU_SOURCE
#include <sched.h>
diff --git a/example/ndpi_util.c b/example/ndpi_util.c
index 104aa4db5..0d690e767 100644
--- a/example/ndpi_util.c
+++ b/example/ndpi_util.c
@@ -21,6 +21,10 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include "ndpi_config.h"
+#endif
+
#include <stdlib.h>
#ifdef WIN32
diff --git a/src/include/ndpi_main.h b/src/include/ndpi_main.h
index 2440060df..79eeab8f1 100644
--- a/src/include/ndpi_main.h
+++ b/src/include/ndpi_main.h
@@ -24,7 +24,6 @@
#ifndef __NDPI_MAIN_H__
#define __NDPI_MAIN_H__
-#include "ndpi_config.h"
#include "ndpi_includes.h"
#include "ndpi_define.h"
#include "ndpi_protocol_ids.h"
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index e798dffba..dcbcc1ab9 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -21,6 +21,10 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include "ndpi_config.h"
+#endif
+
#include <stdlib.h>
#include <errno.h>
#include "ahocorasick.h"