--- parser3/src/include/pa_charset.h	2003/01/28 11:38:49	1.20.2.4
+++ parser3/src/include/pa_charset.h	2003/01/28 15:16:49	1.20.2.6
@@ -8,7 +8,7 @@
 #ifndef PA_CHARSET_H
 #define PA_CHARSET_H
 
-static const char* IDENT_CHARSET_H="$Date: 2003/01/28 11:38:49 $";
+static const char* IDENT_CHARSET_H="$Date: 2003/01/28 15:16:49 $";
 
 #include "pa_pool.h"
 #include "pa_exception.h"
@@ -42,10 +42,11 @@ struct Charset_TransRec {
 	registers libxml transcoders
 */
 class Charset: public PA_Object {
+	Pool pool_for_load;
 public:
 
-	Charset(ConstStringPtr aname, ConstStringPtr afile_spec, Pool* apool_for_load);
-	override Charset::~Charset();
+	Charset(ConstStringPtr aname, ConstStringPtr afile_spec);
+	override ~Charset();
 	
 	ConstStringPtr name() const { return fname; }
 
@@ -66,7 +67,7 @@ public:
 
 private:
 
-	void loadDefinition(Pool& apool_for_load, ConstStringPtr afile_spec);
+	void load_definition(ConstStringPtr afile_spec);
 	void sort_ToTable();
 
 	void transcodeToUTF8(Pool& pool,
@@ -141,6 +142,14 @@ DECLARE_OBJECT_PTR(Charset)
 extern CharsetPtr UTF8_charset;
 
 
+struct Request_charset_info {
+	Pool *pool;
+	Charset *source;
+	Charset *client;
+	Charset *mail;
+};
+
+
 #ifdef XML
 /// Auto-object used to track GdomeDOMString usage
 class GdomeDOMString_auto_ptr {