--- parser3/src/include/pa_globals.h	2003/01/28 11:38:49	1.101.2.5
+++ parser3/src/include/pa_globals.h	2003/11/06 08:22:49	1.105
@@ -1,19 +1,23 @@
 /** @file
 	Parser: global decls.
 
-	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_GLOBALS_H
 #define PA_GLOBALS_H
 
-static const char* IDENT_GLOBALS_H="$Date: 2003/01/28 11:38:49 $";
+static const char* IDENT_GLOBALS_H="$Date: 2003/11/06 08:22:49 $";
+
 
-#include "pa_pool.h"
 #include "pa_hash.h"
 #include "pa_string.h"
 
+#ifdef XML
+#	include "libxml/tree.h"
+#endif
+
 class Dictionary;
 class Charset;
 class Table;
@@ -24,68 +28,6 @@ void pa_globals_init();
 /// hex_value[c] = hex value of c
 extern short hex_value[0x100];
 
-//@{
-/// global string
-extern StringPtr optimized_html_name;
-extern StringPtr content_type_name;
-extern StringPtr charset_name;
-extern StringPtr body_name;
-extern StringPtr download_name;
-extern StringPtr value_name;
-extern StringPtr expires_name;
-extern StringPtr path_name;
-extern StringPtr name_name;
-extern StringPtr size_name;
-extern StringPtr text_name;
-
-extern StringPtr conf_method_name;
-extern StringPtr auto_method_name;
-
-extern StringPtr main_class_name;
-
-
-extern StringPtr charsets_name;
-
-extern StringPtr mime_types_name;
-extern StringPtr origins_mode_name;
-
-extern StringPtr result_var_name;
-extern StringPtr match_var_name;
-
-extern StringPtr exception_var_name;
-extern StringPtr exception_type_part_name;
-extern StringPtr exception_source_part_name;
-extern StringPtr exception_comment_part_name;
-extern StringPtr exception_handled_part_name;
-
-extern StringPtr content_disposition_name;
-extern StringPtr content_disposition_value;
-extern StringPtr content_disposition_filename_name;
-
-extern StringPtr limits_name;
-
-extern StringPtr class_path_name;
-
-extern StringPtr switch_data_name;
-
-extern StringPtr cache_data_name;
-
-extern StringPtr sql_limit_name;
-extern StringPtr sql_offset_name;
-extern StringPtr sql_default_name;
-extern StringPtr sql_distinct_name;
-
-extern StringPtr hash_default_element_name;
-
-extern StringPtr http_method_name;
-extern StringPtr http_timeout_name;
-extern StringPtr http_headers_name;
-extern StringPtr http_any_status_name;
-extern StringPtr file_status_name;
-
-//@}
-
-
 #ifdef XML
 /// DOMImplementation
 extern GdomeDOMImplementation *domimpl;
@@ -93,7 +35,7 @@ extern GdomeDOMImplementation *domimpl;
 /// flag whether there were some xml generic errors on current thread
 bool xmlHaveGenericErrors();
 /// get xml generic error accumulated for current thread. WARNING: it is up to caller to free up
-const char *xmlGenericErrors();
+const char* xmlGenericErrors();
 #endif
 
 #endif