From 532120448101bc00b1d3e424a57c64569e54221f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B6derberg?= Date: Wed, 24 Jun 2015 17:48:52 +0200 Subject: [PATCH] Don't mess with system types. is no problem on a unix system with sys/types.h However on Windows it will result in a #undef pid_t ... When libwebsockets is used with pthreads32 which typedefs pid_t itself, it will fail to build with some weird errors. Also since we're exporitng these macros to the entire world via libwebsockets.h we should not define a VERSION macro. Which is defined improperly anyway. --- lws_config.h.in | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/lws_config.h.in b/lws_config.h.in index eb834c677..791940249 100644 --- a/lws_config.h.in +++ b/lws_config.h.in @@ -1,4 +1,4 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ +/* lws_config.h Generated from lws_config.h.in */ #ifndef NDEBUG #ifndef _DEBUG @@ -148,26 +148,14 @@ */ #undef LT_OBJDIR // We're not using libtool -/* Version number of package */ -#cmakedefine VERSION - /* Define to rpl_malloc if the replacement function should be used. */ #cmakedefine malloc -/* Define to `int' if does not define. */ -#cmakedefine pid_t - /* Define to rpl_realloc if the replacement function should be used. */ #cmakedefine realloc -/* Define to `unsigned int' if does not define. */ -#cmakedefine size_t - /* Define to 1 if we have getifaddrs */ #cmakedefine LWS_HAVE_GETIFADDRS -/* Define as `fork' if `vfork' does not work. */ -//#cmakedefine vfork - /* Define if the inline keyword doesn't exist. */ #cmakedefine inline ${inline}