--- parser3/src/include/pa_config_includes.h 2019/12/03 02:48:50 1.59 +++ parser3/src/include/pa_config_includes.h 2024/11/24 12:51:50 1.75 @@ -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-2024 Art. Lebedev Studio (http://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian when used Configure [HAVE_CONFIG_H] it uses defines from Configure, fixed otherwise. @@ -96,6 +96,10 @@ # include #endif +#ifdef HAVE_PTHREAD_H +# include +#endif + #ifdef HAVE_ERRNO_H # include #endif @@ -161,6 +165,10 @@ # endif #endif +#ifdef HAVE_PCRE2 +#define PCRE2_CODE_UNIT_WIDTH 8 +#endif + // math function replacements #ifdef __cplusplus @@ -178,10 +186,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 @@ -233,7 +254,6 @@ inline size_t min(size_t a, size_t b){ r #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: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 @@ -241,7 +261,6 @@ 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:4244) // conversion from 'std::size_t' to 'double', possible loss of data #endif #endif