From 09f3947b4c8cee8ccebe4755463aae593e9c0d56 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Fri, 21 Jul 2017 19:25:41 +0800 Subject: [PATCH] lws_intptr_t: fix ordering https://github.com/warmcat/libwebsockets/issues/973 --- lib/libwebsockets.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/libwebsockets.h b/lib/libwebsockets.h index 5e897b1..48ef9e2 100644 --- a/lib/libwebsockets.h +++ b/lib/libwebsockets.h @@ -33,12 +33,11 @@ extern "C" { #include #endif -#if defined(LWS_HAS_INTPTR_T) -#include -#define lws_intptr_t intptr_t -#else -typedef unsigned long long lws_intptr_t; -#endif +#include "lws_config.h" + +/* + * CARE: everything using cmake defines needs to be below here + */ #if defined(LWS_WITH_ESP8266) struct sockaddr_in; @@ -47,7 +46,12 @@ struct sockaddr_in; #define LWS_POSIX 1 #endif -#include "lws_config.h" +#if defined(LWS_HAS_INTPTR_T) +#include +#define lws_intptr_t intptr_t +#else +typedef unsigned long long lws_intptr_t; +#endif #if defined(WIN32) || defined(_WIN32) #ifndef WIN32_LEAN_AND_MEAN -- 2.7.4