From 04da2ccd1e8c5b582c4e2a77ee53f929ae8f22a0 Mon Sep 17 00:00:00 2001

Subject: [PATCH] Always include lws_config.h since now we have only CMake
 build

diff --git a/lib/libwebsockets.h b/lib/libwebsockets.h
index 5dc97c7..b253d92 100644 (file)
--- a/lib/libwebsockets.h
+++ b/lib/libwebsockets.h
@@ -29,10 +29,9 @@ extern "C" {
 #else
 #include <stdarg.h>
 #endif
-       
-#ifdef CMAKE_BUILD
+
+/* That's a bad idea since it will leak all internal defines outside */
 #include "lws_config.h"
-#endif
 
 #if defined(WIN32) || defined(_WIN32)
 

diff --git a/lib/private-libwebsockets.h b/lib/private-libwebsockets.h
index 3e8657c..a862234 100644 (file)
--- a/lib/private-libwebsockets.h
+++ b/lib/private-libwebsockets.h
@@ -19,17 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-/* System introspection configs */
-#ifdef CMAKE_BUILD
 #include "lws_config.h"
-#else
-#if defined(WIN32) || defined(_WIN32)
-#define inline __inline
-#else /* not WIN32 */
-#include "config.h"
-
-#endif /* not WIN32 */
-#endif /* not CMAKE */
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>

diff --git a/test-server/test-client.c b/test-server/test-client.c
index 73cd7d8..624e2bf 100644 (file)
--- a/test-server/test-client.c
+++ b/test-server/test-client.c
@@ -31,9 +31,7 @@
 #include <unistd.h>
 #endif
 
-#ifdef CMAKE_BUILD
 #include "lws_config.h"
-#endif
 
 #include "../lib/libwebsockets.h"
 

diff --git a/test-server/test-echo.c b/test-server/test-echo.c
index c35af1b..e26e477 100644 (file)
--- a/test-server/test-echo.c
+++ b/test-server/test-echo.c
@@ -35,9 +35,7 @@
 #include <unistd.h>
 #endif
 
-#ifdef CMAKE_BUILD
 #include "lws_config.h"
-#endif
 
 #include "../lib/libwebsockets.h"
 

diff --git a/test-server/test-ping.c b/test-server/test-ping.c
index 504af80..fefca31 100644 (file)
--- a/test-server/test-ping.c
+++ b/test-server/test-ping.c
@@ -35,9 +35,7 @@
 #include <unistd.h>
 #endif
 
-#ifdef CMAKE_BUILD
 #include "lws_config.h"
-#endif
 
 #include "../lib/libwebsockets.h"
 

diff --git a/test-server/test-server.c b/test-server/test-server.c
index b321ff8..8643c93 100644 (file)
--- a/test-server/test-server.c
+++ b/test-server/test-server.c
@@ -18,9 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA  02110-1301  USA
  */
-#ifdef CMAKE_BUILD
 #include "lws_config.h"
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>