--- parser3/src/main/pa_globals.C	2016/09/21 15:07:34	1.197
+++ parser3/src/main/pa_globals.C	2019/12/05 22:39:15	1.202
@@ -1,7 +1,7 @@
 /** @file
 	Parser: globals.
 
-	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
@@ -28,7 +28,7 @@ extern "C" {
 #include "ltdl.h"
 #include "pcre.h"
 
-volatile const char * IDENT_PA_GLOBALS_C="$Id: pa_globals.C,v 1.197 2016/09/21 15:07:34 moko Exp $" IDENT_PA_GLOBALS_H IDENT_PA_SAPI_H;
+volatile const char * IDENT_PA_GLOBALS_C="$Id: pa_globals.C,v 1.202 2019/12/05 22:39:15 moko Exp $" IDENT_PA_GLOBALS_H IDENT_PA_SAPI_H;
 
 // defines
 
@@ -125,7 +125,7 @@ static char *pa_GC_strdup(const char *s)
 		return 0;
 
 	size_t size=strlen(s)+1;
-	char *result=(char *)pa_gc_malloc_atomic(size);
+	char *result=(char *)GC_MALLOC_ATOMIC(size);
 
 	if(!result)
 		pa_fail_alloc("duplicate XML string",size);
@@ -140,27 +140,27 @@ static char *pa_GC_strdup(const char *s)
 #ifdef PA_DEBUG_XML_GC_MEMORY
 
 static void* pa_gc_malloc_log(size_t size){
-	void *p=pa_gc_malloc(size);
+	void *p=GC_MALLOC(size);
         fprintf(stderr, "pa_gc_malloc_log(%d)=0x%p\n", size, p);
 	return p;
         
 }
 
 static void* pa_gc_malloc_atomic_log(size_t size){
-	void *p=pa_gc_malloc_atomic(size);
+	void *p=GC_MALLOC_ATOMIC(size);
         fprintf(stderr, "pa_gc_malloc_atomic_log(%d)=0x%p\n", size, p);
 	return p;
 }
 
 static void* pa_gc_realloc_log(void *ptr, size_t size){
-	void *p=pa_gc_realloc(ptr, size);
+	void *p=GC_REALLOC(ptr, size);
         fprintf(stderr, "pa_gc_realloc_log(0x%p, %d)=0x%p\n", ptr, size, p);
 	return p;
 }
 
 static void pa_gc_free_log(void *p){
         fprintf(stderr, "pa_gc_free_log(0x%p)\n", p);
-        pa_gc_free(p);
+        GC_FREE(p);
 }
 
 #else
@@ -172,19 +172,19 @@ inline void *check(void *result, const c
 }
 
 static void* pa_gc_malloc_nonull(size_t size) { 
-	return check(pa_gc_malloc(size), "allocate XML compsite memory", size);
+	return check(GC_MALLOC(size), "allocate XML compsite memory", size);
 }
 
 static void* pa_gc_malloc_atomic_nonull(size_t size) { 
-	return check(pa_gc_malloc_atomic(size), "allocate XML atomic memory", size);
+	return check(GC_MALLOC_ATOMIC(size), "allocate XML atomic memory", size);
 }
 
 static void* pa_gc_realloc_nonull(void* ptr, size_t size) { 
-	return check(pa_gc_realloc(ptr, size), "reallocate XML memory", size);
+	return check(GC_REALLOC(ptr, size), "reallocate XML memory", size);
 }
 
 static void pa_gc_free_maybeignore(void* ptr) {
-	pa_gc_free(ptr);
+	GC_FREE(ptr);
 }
 
 #endif
@@ -221,8 +221,8 @@ static void gc_substitute_memory_managem
 #endif
 
 	// pcre
-	pcre_malloc=pa_gc_malloc;
-	pcre_free=pa_gc_free;
+	pcre_malloc=pa_malloc;
+	pcre_free=pa_free;
 
 	// cord
 	CORD_oom_fn=pa_CORD_oom_fn;
@@ -312,45 +312,45 @@ void pa_dlinit() {
 
 #ifdef _MSC_VER
 
-#ifndef PA_DEBUG_DISABLE_GC
+#define PREFIX "../../../../win32/"
 
-#define GC_LIB "../../../../win32/gc"
 #ifdef _DEBUG
-#pragma comment(lib, GC_LIB "/Debug/gc.lib")
+#define CONFIGURATION "Debug"
+#else
+#define CONFIGURATION "Release"
+#endif
+
+#ifdef _WIN64
+#define PLATFORM_64 "x64/"
+#define PLATFORM_32 ""
 #else
-#pragma comment(lib, GC_LIB "/Release/gc.lib")
+#define PLATFORM_64 ""
+#define PLATFORM_32 "win32/"
 #endif
 
+#pragma comment(lib, PREFIX "pcre/" PLATFORM_64 CONFIGURATION "/pcre.lib")
+
+#ifndef PA_DEBUG_DISABLE_GC
+
+#pragma comment(lib, PREFIX "gc/" PLATFORM_64 CONFIGURATION "/gc.lib")
+
 #endif // PA_DEBUG_DISABLE_GC
 
 
 #ifdef XML
 
-#define GNOME_LIBS "../../../../win32/gnome"
+#define GNOME_LIBS PREFIX "gnome"
 
-#ifdef _DEBUG
-#define LIB_XML GNOME_LIBS "/libxml2-x.x.x/win32/debug/lib/"
-#define LIB_XSLT GNOME_LIBS "/libxslt-x.x.x/win32/debug/lib/"
-#else
-#define LIB_XML GNOME_LIBS "/libxml2-x.x.x/win32/release/lib/"
-#define LIB_XSLT GNOME_LIBS "/libxslt-x.x.x/win32/release/lib/"
-#endif
+#define LIB_XML PREFIX "gnome/libxml2-x.x.x/" PLATFORM_64 PLATFORM_32 CONFIGURATION "/lib/"
+#define LIB_XSLT PREFIX "gnome/libxslt-x.x.x/" PLATFORM_64 PLATFORM_32 CONFIGURATION "/lib/"
 
-#ifdef LIBXML_STATIC
+#ifdef XML_STATIC
 #pragma comment(lib, LIB_XML "libxml2_a.lib")
-#else
-#pragma comment(lib, LIB_XML "libxml2.lib")
-#endif
-
-#ifdef LIBXSLT_STATIC
 #pragma comment(lib, LIB_XSLT "libxslt_a.lib")
-#else
-#pragma comment(lib, LIB_XSLT "libxslt.lib")
-#endif
-
-#ifdef LIBEXSLT_STATIC
 #pragma comment(lib, LIB_XSLT "libexslt_a.lib")
 #else
+#pragma comment(lib, LIB_XML "libxml2.lib")
+#pragma comment(lib, LIB_XSLT "libxslt.lib")
 #pragma comment(lib, LIB_XSLT "libexslt.lib")
 #endif