--- parser3/src/include/pa_config_includes.h 2013/07/21 20:33:44 1.39 +++ parser3/src/include/pa_config_includes.h 2017/02/08 13:05:46 1.52 @@ -1,7 +1,7 @@ /** @file Parser: includes all Configure-d headers - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) when used Configure [HAVE_CONFIG_H] it uses defines from Configure, @@ -31,13 +31,12 @@ # include #endif -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include +#endif + +#ifdef HAVE_STDDEF_H # include -#else -# ifdef HAVE_STDLIB_H -# include -# endif #endif #ifdef HAVE_STRING_H @@ -129,13 +128,13 @@ # include #endif +#ifdef HAVE_SYS_WAIT_H +# include +#endif + #ifdef HAVE_SYS_SOCKET_H # include -#else -# if defined(HAVE_WINSOCK_H) && !defined(_MSC_VER) && !defined(CYGWIN) -# include -# endif #endif #ifdef HAVE_NETINET_IN_H @@ -150,7 +149,6 @@ # include #endif -// must go anywhere after winsock [cygwin time.h checks for already inclusion of winsock.h] #if TIME_WITH_SYS_TIME # include @@ -163,10 +161,6 @@ # endif #endif -#ifdef WIN32 -#include -#endif - // math function replacements #ifdef __cplusplus @@ -192,32 +186,32 @@ inline size_t min(size_t a, size_t b){ r #endif +#if defined(__GNUC__) +# define PA_ATTR_UNUSED __attribute__((unused)) +#else +# define PA_ATTR_UNUSED +#endif + #ifdef WIN32 #define THREAD_LOCAL __declspec(thread) #else #define THREAD_LOCAL // __thread // multithreading support required only for apache2 module #endif -#if _MSC_VER +#if __clang__ +#pragma clang diagnostic ignored "-Wparentheses" // if(a=b) +#endif +#ifdef _MSC_VER #pragma warning(disable:4355) // using this in calls to parent constructors - #pragma warning(disable:4291) // no matching operator delete found; memory will not be freed if initialization throws an exception - -#pragma warning(disable:4786) // identifier was truncated to '255' characters in the debug information - -#pragma warning(disable:4511) // copy constructor could not be generated - #pragma warning(disable:4512) // assignment operator could not be generated - #pragma warning(disable:4505) // unreferenced local function has been removed - #pragma warning(disable:4127) // conditional expression is constant; while(true) OK - #pragma warning(disable:4706) // assignment within conditional expression if(type var=somethig) OK - #pragma warning(disable:4996) // memcpy deprecation - +#pragma warning(disable:4702) // unreachable code +#pragma warning(disable:4511) // copy constructor could not be generated (vs2003 specific) #endif /// to debug backtrace pointers switch this on: