--- parser3/src/include/pa_config_includes.h 2020/12/15 00:37:02 1.65 +++ parser3/src/include/pa_config_includes.h 2026/09/20 00:22:19 1.82 @@ -1,8 +1,8 @@ /** @file Parser: includes all Configure-d headers - Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian when used Configure [HAVE_CONFIG_H] it uses defines from Configure, fixed otherwise. @@ -153,16 +153,16 @@ # include #endif - -#if TIME_WITH_SYS_TIME +#ifdef HAVE_SYS_TIME_H # include +#endif + +#ifdef HAVE_TIME_H # include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif +#endif + +#ifdef HAVE_PCRE2 +#define PCRE2_CODE_UNIT_WIDTH 8 #endif // math function replacements @@ -182,10 +182,10 @@ inline double sign(double param) { retur #endif #if !defined(max) -inline int max(int a, int b) { return a>b?a:b; } -inline int min(int a, int b){ return ab?a:b; } -inline size_t min(size_t a, size_t b){ return ab ? a : b; } +inline int min(int a, int b){ return ab ? a : b; } +inline size_t min(size_t a, size_t b){ return a= 7) #pragma GCC diagnostic ignored "-Wimplicit-fallthrough" // case without break #endif #ifdef _MSC_VER + +// must be the very first Windows include: to prevent windows.h auto-include the legacy winsock.h +#include + // VS 2003 #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 @@ -248,6 +262,9 @@ inline size_t min(size_t a, size_t b){ r #pragma warning(disable:4511) // copy constructor could not be generated (vs2003 specific) // VS 2015 #pragma warning(disable:4267) // conversion from 'size_t' to 'int', possible loss of data +#pragma warning(disable:4456) // local declaration hides another local +#pragma warning(disable:4458) // declaration hides class member +#pragma warning(disable:4459) // declaration hides global #endif #endif