--- parser3/src/main/pa_globals.C	2004/10/07 09:23:44	1.176
+++ parser3/src/main/pa_globals.C	2008/08/15 15:30:21	1.183
@@ -1,11 +1,11 @@
 /** @file
 	Parser: globals.
 
-	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_GLOBALS_C="$Date: 2004/10/07 09:23:44 $";
+static const char * const IDENT_GLOBALS_C="$Date: 2008/08/15 15:30:21 $";
 
 #include "pa_config_includes.h"
 
@@ -18,8 +18,6 @@ extern "C" {
 };
 #endif
 
-#include "pcre.h"
-
 #include "pa_globals.h"
 #include "pa_string.h"
 #include "pa_sapi.h"
@@ -29,24 +27,22 @@ extern "C" {
 
 #include "pa_cache_managers.h"
 
+#include "pcre.h"
+
 // defines
 
 //#define PA_DEBUG_XML_GC_MEMORY
 
-// 20040920 for now both workarounds needed. wait for new libxml/xsl versions
-// there is a problem with testcase, it's unstable. 
-// see paf@six/bug20040920/cgi-bin/t for it-showed-bug-on-20040920-day
-#define PA_WORKAROUND_BUGGY_FREE_IN_LIBXML_GC_MEMORY
-#define PA_WORKAROUND_BUGGY_MALLOCATOMIC_IN_LIBXML_GC_MEMORY
+//20051130 trying to remove this, author claims that fixed a lot there // 20040920 for now both workarounds needed. wait for new libxml/xsl versions
+// // there is a problem with testcase, it's unstable. 
+// // see paf@six/bug20040920/cgi-bin/t for it-showed-bug-on-20040920-day
+// #define PA_WORKAROUND_BUGGY_FREE_IN_LIBXML_GC_MEMORY
+// #define PA_WORKAROUND_BUGGY_MALLOCATOMIC_IN_LIBXML_GC_MEMORY
 
 // globals
 
 short hex_value[0x100];
 
-#ifdef XML
-GdomeDOMImplementation *domimpl;
-#endif
-
 static void setup_hex_value() {
 	memset(hex_value, 0, sizeof(hex_value));
 	hex_value['0'] = 0;	
@@ -151,15 +147,14 @@ const char* xmlGenericErrors() {
 #endif
 
 void pa_globals_destroy(void *) {
+/*
 	try {
 #ifdef XML
-		GdomeException exc;
-		gdome_di_unref (domimpl, &exc);
-		// uncomment SAPI::abort below if adding potential-throw code here
 #endif
-	} catch(const Exception& e) {
+	} catch(.../*const Exception& e* /) {
 //		SAPI::abort("pa_globals_destroy failed: %s", e.comment());
 	}
+*/
 }
 
 
@@ -335,8 +330,6 @@ void pa_globals_init() {
 #ifdef XML
 	// initializing xml libs
 
-	/* First get a DOMImplementation reference */
-	domimpl = gdome_di_mkref ();
 	/*
 	* Register the EXSLT extensions and the test module
 	*/
@@ -401,9 +394,13 @@ void pa_globals_done() {
 
 #endif
 
-#ifdef XML
-#	define GNOME_LIBS "../../../../win32/gnome"
+#define GNOME_LIBS "../../../../win32/gnome"
+
+#ifdef WITH_MAILRECEIVE
 #	pragma comment(lib, GNOME_LIBS "/glib/lib/libglib-1.3-11.lib")
+#endif
+
+#ifdef XML
 #	ifdef _DEBUG
 
 #		ifdef LIBXML_STATIC
@@ -423,12 +420,6 @@ void pa_globals_done() {
 #			pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/debug/lib/libexslt.lib")
 #		endif
 
-#		ifdef LIBGDOME_STATIC
-#			pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/DebugStatic/libgdome.lib")
-#		else
-#			pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/DebugDynamic/libgdome.lib")
-#		endif
-
 #else
 
 #		ifdef LIBXML_STATIC
@@ -448,12 +439,6 @@ void pa_globals_done() {
 #			pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/release/lib/libexslt.lib")
 #		endif
 
-#		ifdef LIBGDOME_STATIC
-#			pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/ReleaseStatic/libgdome.lib")
-#		else
-#			pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/ReleaseDynamic/libgdome.lib")
-#		endif
-
 #	endif
 #endif