From 587f156557c67a8dd4e025d7ce08b154cbb1132d Mon Sep 17 00:00:00 2001
From: Campus <campus@ntop.org>
Date: Mon, 30 Nov 2015 12:37:15 +0100
Subject: reorganized header files - added ndpi_includes.h

---
 src/include/ndpi_main.h | 39 ++++-----------------------------------
 1 file changed, 4 insertions(+), 35 deletions(-)

(limited to 'src/include/ndpi_main.h')

diff --git a/src/include/ndpi_main.h b/src/include/ndpi_main.h
index d5c15c7e4..a70f35c8d 100644
--- a/src/include/ndpi_main.h
+++ b/src/include/ndpi_main.h
@@ -22,41 +22,10 @@
  *
  */
 
-#ifndef __NDPI_MAIN_INCLUDE_FILE__
-#define __NDPI_MAIN_INCLUDE_FILE__
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#ifndef WIN32
-#include <pthread.h>
-#endif
-#include <ctype.h>
-#include <time.h>
-
-
-#ifdef WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
-#include <arpa/inet.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#if !defined __APPLE__ && !defined __FreeBSD__ && !defined __NetBSD__ && !defined __OpenBSD__
-#include <endian.h>
-#include <byteswap.h>
-#if defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
-#include <netinet/in.h>
-#endif
-#endif
-
-/* default includes */
-
-#include <sys/param.h>
-#include <limits.h>
-#endif
+#ifndef __NDPI_MAIN_H__
+#define __NDPI_MAIN_H__
 
+#include "ndpi_includes.h"
 #include "ndpi_define.h"
 #include "ndpi_protocol_ids.h"
 #include "ndpi_typedefs.h"
@@ -138,4 +107,4 @@ void ndpi_debug_get_last_log_function_line(struct ndpi_detection_module_struct *
 					   const char **file, const char **func, u_int32_t * line);
 #endif
 
-#endif	/* __NDPI_MAIN_INCLUDE_FILE__ */
+#endif	/* __NDPI_MAIN_H__ */
-- 
cgit v1.2.3