--- parser3/src/include/pa_config_includes.h	2013/07/29 15:02:17	1.44
+++ parser3/src/include/pa_config_includes.h	2024/07/24 19:42:18	1.72
@@ -1,8 +1,8 @@
 /** @file
 	Parser: includes all Configure-d headers
 
-	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 
 	when used Configure [HAVE_CONFIG_H] it uses defines from Configure,
 	fixed otherwise.
@@ -96,6 +96,10 @@
 # include <signal.h>
 #endif
 
+#ifdef HAVE_PTHREAD_H
+# include <pthread.h>
+#endif
+
 #ifdef HAVE_ERRNO_H
 # include <errno.h>
 #endif
@@ -161,6 +165,10 @@
 # endif
 #endif
 
+#ifdef HAVE_PCRE2
+#define PCRE2_CODE_UNIT_WIDTH 8
+#endif
+
 // math function replacements
 
 #ifdef __cplusplus
@@ -184,43 +192,69 @@ inline size_t max(size_t a, size_t b) {
 inline size_t min(size_t a, size_t b){ return a<b?a:b; }
 #endif
 
-#endif
+#endif // __cplusplus
 
-#ifdef WIN32
-#define THREAD_LOCAL __declspec(thread)
-#else
-#define THREAD_LOCAL // __thread // multithreading support required only for apache2 module
-#endif
+// libgc usage configuration
+//#define PA_DEBUG_DISABLE_GC
 
-#if _MSC_VER
+#ifdef PA_DEBUG_DISABLE_GC
 
-#pragma warning(disable:4355)  // using this in calls to parent constructors
+#define GC_MALLOC(size) memset(malloc(size), 0 , size)
+#define GC_MALLOC_ATOMIC(size) memset(malloc(size), 0 , size)
+#define GC_REALLOC(ptr, size) realloc(ptr, size)
+#define GC_FREE(ptr) free(ptr)
 
-#pragma warning(disable:4291)  // no matching operator delete found; memory will not be freed if initialization throws an exception
+#define GC_NEW(t) (t *)GC_MALLOC(sizeof (t))
+#define GC_NEW_ATOMIC(t) (t *)GC_MALLOC_ATOMIC(sizeof (t))
 
-#pragma warning(disable:4786)  // identifier was truncated to '255' characters in the debug information
+#else
 
-#pragma warning(disable:4511)  // copy constructor could not be generated
+// allows to backtrace pointers
+//#define GC_DEBUG
 
-#pragma warning(disable:4512)  // assignment operator could not be generated
+#include "../lib/gc/include/gc.h"
 
-#pragma warning(disable:4505)  // unreferenced local function has been removed
+#endif // PA_DEBUG_DISABLE_GC
 
-#pragma warning(disable:4127)  // conditional expression is constant; while(true) OK
 
-#pragma warning(disable:4706)  // assignment within conditional expression if(type var=somethig) OK
+#ifdef __GNUC__
+#  define PA_ATTR_UNUSED __attribute__((unused))
+#else
+#  define PA_ATTR_UNUSED
+#endif
 
-#pragma warning(disable:4996)  // memcpy deprecation
+#ifdef WIN32
+#define THREAD_LOCAL __declspec(thread)
+#else
+#ifdef HAVE_TLS
+#define THREAD_LOCAL __thread
+#else
+#define THREAD_LOCAL
+#endif
+#endif
 
-#pragma warning(disable:4702)  // unreachable code
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wparentheses"         // if(a=b)
+#pragma clang diagnostic ignored "-Wpointer-sign"        // CORD (unsigned char *) to char * in libcord
+#pragma clang diagnostic ignored "-Winline-new-delete"   // test for regular new/delete usage in memory.h
+
+#elif defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"  // case without break
 
 #endif
 
-/// to debug backtrace pointers switch this on:
-#if defined(_DEBUG) || defined(PA_RELEASE_ASSERTS)
-//// this switches on straightforward realloc implementation, bad for profiling
-//// note: this is incompatible with -DGC_ASSERTIONS, which can be switched ON in win32/gc/NT_THREADS_MAKEFILE
-#define GC_DEBUG
+#ifdef _MSC_VER
+// 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
+#pragma warning(disable:4512)  // assignment operator could not be generated
+#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)
+// VS 2015
+#pragma warning(disable:4267) // conversion from 'size_t' to 'int', possible loss of data
 #endif
 
 #endif