--- parser3/src/main/pa_globals.C	2003/05/11 12:37:07	1.152.2.19.2.19
+++ parser3/src/main/pa_globals.C	2003/07/24 07:21:03	1.152.2.19.2.22
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_GLOBALS_C="$Date: 2003/05/11 12:37:07 $";
+static const char* IDENT_GLOBALS_C="$Date: 2003/07/24 07:21:03 $";
 
 #include "pa_config_includes.h"
 
@@ -81,7 +81,7 @@ public:
 		thread_id=0; 
 		buf[used=0]=0;
 	}
-	const char* getnd_reset() {
+	const char* get_and_reset() {
 		char* result=new(PointerFreeGC) char[used+1];
 		memcpy(result, buf, used+1);
 		reset();
@@ -100,7 +100,8 @@ XML_Generic_error_info *xml_generic_erro
 
 static void
 xmlParserGenericErrorFunc(void *ctx, const char* msg, ...) { 
-    pa_thread_t thread_id=pa_get_thread_id();
+	//_asm int 3;
+	pa_thread_t thread_id=pa_get_thread_id();
 
 	// infinitely looking for free slot to fill it
 	while(true) {
@@ -110,7 +111,7 @@ xmlParserGenericErrorFunc(void *ctx, con
 		XML_Generic_error_info *p=xml_generic_error_info(thread_id);
 		if(!p) { // occupy empty one
 			p=xml_generic_error_info(0);
-			if(!p) // wait for empty for it to appear
+			if(!p) // wait for empty one to appear
 				continue;
 		}
 
@@ -126,7 +127,7 @@ xmlParserGenericErrorFunc(void *ctx, con
 }
 
 bool xmlHaveGenericErrors() {
-    pa_thread_t thread_id=pa_get_thread_id();
+	pa_thread_t thread_id=pa_get_thread_id();
 
 	SYNCHRONIZED;  // find blocked
 
@@ -134,7 +135,7 @@ bool xmlHaveGenericErrors() {
 }
 
 const char* xmlGenericErrors() {
-    pa_thread_t thread_id=pa_get_thread_id();
+	pa_thread_t thread_id=pa_get_thread_id();
 
 	SYNCHRONIZED;  // find+free blocked
 
@@ -142,7 +143,7 @@ const char* xmlGenericErrors() {
 	if(!p) // no errors for our thread_id registered
 		return 0;
 
-	return p->getnd_reset();
+	return p->get_and_reset();
 }
 
 /**
@@ -155,9 +156,9 @@ const char* xmlGenericErrors() {
  */
 static int
 xmlFileMatchLocalhost(const char* filename) {
-    if (!strncmp(filename, "http://localhost", 16))
-	return(1);
-    return(0);
+	if (!strncmp(filename, "http://localhost", 16))
+		return(1);
+	return(0);
 }
 
 
@@ -174,20 +175,21 @@ xmlFileMatchLocalhost(const char* filena
  */
 static void *
 xmlFileOpenLocalhost (const char* filename) {
-    FILE *fd;
-    const char* documentRoot;
-    char path[1000];
-
+	//_asm int 3;
+	FILE *fd;
+	const char* documentRoot;
+	char path[1000];
+	
 	path[0]=0;
 	strcat(path, (documentRoot=getenv("DOCUMENT_ROOT"))?documentRoot:".");
 	strcat(path, &filename[16]);
-
+	
 #ifdef WIN32
-    fd = fopen(path, "rb");
+	fd = fopen(path, "rb");
 #else
-    fd = fopen(path, "r");
+	fd = fopen(path, "r");
 #endif /* WIN32 */
-    return((void *) fd);
+	return((void *) fd);
 }
 
 /**
@@ -202,7 +204,7 @@ xmlFileOpenLocalhost (const char* filena
  */
 static int
 pa_xmlFileRead (void * context, char * buffer, int len) {
-    return(fread(&buffer[0], 1,  len, (FILE *) context));
+	return(fread(&buffer[0], 1,  len, (FILE *) context));
 }
 
 /**
@@ -213,7 +215,7 @@ pa_xmlFileRead (void * context, char * b
  */
 static int
 pa_xmlFileClose (void * context) {
-    return ( ( fclose((FILE *) context) == EOF ) ? -1 : 0 );
+	return ( ( fclose((FILE *) context) == EOF ) ? -1 : 0 );
 }
 
 #endif
@@ -400,7 +402,7 @@ void pa_globals_init() {
 #ifdef _MSC_VER
 
 #ifndef PA_DEBUG_DISABLE_GC
-#	define GC_LIB "/parser3project/win32/gc"
+#	define GC_LIB "../../../../win32/gc"
 #	ifdef _DEBUG
 #		pragma comment(lib, GC_LIB "/Debug/gc.lib")
 #	else
@@ -410,14 +412,14 @@ void pa_globals_init() {
 #endif
 
 #ifdef XML
-#	define GNOME_LIBS "/parser3project/win32xml/win32/gnome"
+#	define GNOME_LIBS "../../../../win32xml/win32/gnome"
 #	pragma comment(lib, GNOME_LIBS "/glib/lib/libglib-1.3-11.lib")
 #	ifdef _DEBUG
 
 #		ifdef LIBXML_STATIC
-#			pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/binaries/libxml2_a.lib")
+#			pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/binaries-debug/libxml2_a.lib")
 #		else
-#			pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/binaries/libxml2.lib")
+#			pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/binaries-debug/libxml2.lib")
 #		endif
 
 #		ifdef LIBXSLT_STATIC
@@ -440,9 +442,9 @@ void pa_globals_init() {
 #else
 
 #		ifdef LIBXML_STATIC
-#			pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/dsp/libxml2_ReleaseStatic/libxml2.lib")
+#			pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/binaries-release/libxml2_a.lib")
 #		else
-#			pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/dsp/libxml2_ReleaseDynamic/libxml2.lib")
+#			pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/binaries-release/libxml2.lib")
 #		endif
 
 #		ifdef LIBXSLT_STATIC