--- parser3/src/targets/apache/mod_parser3.c	2010/11/22 23:24:58	1.6
+++ parser3/src/targets/apache/mod_parser3.c	2010/11/23 00:00:32	1.8
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_MOD_PARSER3_C="$Date: 2010/11/22 23:24:58 $";
+static const char * const IDENT_MOD_PARSER3_C="$Date: 2010/11/23 00:00:32 $";
 
 #ifdef WIN32
 #include <winsock2.h>
@@ -45,8 +45,6 @@ static const char * const IDENT_MOD_PARS
 #define apr_pool_t pool
 #define apr_table_t table
 
-#define ap_add_version_component(p, v) ap_add_version_component(v) 
-
 #endif /* STANDARD20_MODULE_STUFF */
 
 /*
@@ -113,7 +111,6 @@ static int parser_handler(request_rec *r
 static void parser_module_init(apr_pool_t *p, server_rec *s) {
 #else
 static void parser_module_init(server_rec *s, apr_pool_t *p) {
-	ap_add_version_component(p, pa_version());
 #endif	
 	ap_log_perror(APLOG_MARK, APLOG_EMERG, 0, p, "parser inited %d", getpid());
 	pa_setup_module_cells();
@@ -184,7 +181,6 @@ static const handler_rec parser_handlers
 */
 static void parser_register_hooks(apr_pool_t* pool)
 {
-//	ap_add_version_component(pool, pa_version());
 //	ap_hook_post_config(parser_server_init, NULL, NULL, APR_HOOK_MIDDLE);
 	ap_hook_handler(parser_handler, NULL, NULL, APR_HOOK_MIDDLE);
 	ap_hook_child_init(parser_module_init, NULL, NULL, APR_HOOK_MIDDLE);
@@ -233,21 +229,6 @@ module MODULE_VAR_EXPORT parser3_module
 
 // interface to C++
 
-#define	PA_APLOG_EMERG		0	/* system is unusable */
-#define	PA_APLOG_ALERT		1	/* action must be taken immediately */
-#define	PA_APLOG_CRIT		2	/* critical conditions */
-#define	PA_APLOG_ERR		3	/* error conditions */
-#define	PA_APLOG_WARNING	4	/* warning conditions */
-#define	PA_APLOG_NOTICE		5	/* normal but significant condition */
-#define	PA_APLOG_INFO		6	/* informational */
-#define	PA_APLOG_DEBUG		7	/* debug-level messages */
-
-#define	PA_APLOG_LEVELMASK	7	/* mask off the level value */
-
-#define PA_APLOG_NOERRNO	(PA_APLOG_LEVELMASK + 1)
-
-#define PA_APLOG_MARK	__FILE__,__LINE__
-
 void pa_ap_log_rerror(const char *file, int line, int level, const pa_request_rec *s, const char *fmt, ...) {
 	const char* str;
 	va_list l;
@@ -323,7 +304,7 @@ int pa_ap_rwrite(const void *buf, int nb
 
 // http_main.h
 
-void pa_ap_hard_timeout(char *s, pa_request_rec *r) {
+void pa_ap_hard_timeout(const char *s, pa_request_rec *r) {
 // Apache 2 uses non-blocking I/O
 #ifndef STANDARD20_MODULE_STUFF
 	ap_hard_timeout(s, (request_rec*)r->real_request_rec);