[Modsnake-cvs] (jick) mod_snake/src conn_rec.imod_snake.irequest_rec.isnake_apr_compat.h

[Mod S. C. L. <mod...@so...>]

Mod Snake CVS committal

Author  : jick
Project : mod_snake
Module  : src
Dir     : mod_snake/src



Modified Files:
	conn_rec.i mod_snake.i request_rec.i snake_apr_compat.h 


Log Message:
Fix up warnings that we get when building for Apache 1.3


===================================================================
RCS file: /cvsroot/modsnake/mod_snake/src/conn_rec.i,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- conn_rec.i	2002/01/07 06:35:18	1.19
+++ conn_rec.i	2002/01/10 22:29:32	1.20
@@ -190,7 +190,7 @@
 				     PyObject *data)
 {
 #ifdef APACHE13
-  SNAKE13_UNSUP_VOID();
+  SNAKE13_UNSUP(NULL);
 #else
   if(mod_snake_add_output_filter_pyhook(NULL, conn, filtername, data) == -1)
     return NULL;
===================================================================
RCS file: /cvsroot/modsnake/mod_snake/src/mod_snake.i,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- mod_snake.i	2001/02/12 03:52:50	1.22
+++ mod_snake.i	2002/01/10 22:29:32	1.23
@@ -339,7 +339,7 @@
 			      const char *name, PyObject *func, int ftype)
 {
 #ifdef APACHE13
-  SNAKE13_UNSUP_VOID();
+  SNAKE13_UNSUP(-1);
 #else
   ModSnakeRegFilter *rfilter;
   char *real_name;
===================================================================
RCS file: /cvsroot/modsnake/mod_snake/src/request_rec.i,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- request_rec.i	2002/01/07 06:35:18	1.31
+++ request_rec.i	2002/01/10 22:29:32	1.32
@@ -84,7 +84,7 @@
 #endif
 }
 
-static char *request_rec_content_language_get(request_rec *obj){
+static const char *request_rec_content_language_get(request_rec *obj){
 #ifdef APACHE13
   return obj->content_language;
 #else
@@ -435,7 +435,7 @@
 					const char *filtername, PyObject *data)
 {
 #ifdef APACHE13
-  SNAKE13_UNSUP_VOID();
+  SNAKE13_UNSUP(NULL);
 #else
   if(mod_snake_add_output_filter_pyhook(req, req->connection, filtername, 
 					data) == -1)
@@ -560,7 +560,7 @@
   char *handler;
   
   %addmethods {
-    char *content_language;
+    const char *content_language;
   }
   ap_array_header_t *content_languages;
   
@@ -583,6 +583,6 @@
   %addmethods {
       PyObject *finfo;
   }
-  apr_uri_t parsed_uri;
+  uri_components parsed_uri;
   
 } request_rec;
===================================================================
RCS file: /cvsroot/modsnake/mod_snake/src/snake_apr_compat.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- snake_apr_compat.h	2001/02/10 09:08:46	1.3
+++ snake_apr_compat.h	2002/01/10 22:29:32	1.4
@@ -106,5 +106,6 @@
 #define ap_stat           apr_stat
 #define ap_ssize_t        apr_ssize_t
 #define ap_time_t         apr_time_t
+#define uri_components    apr_uri_t
 
 #endif /* SNAKE_APR_COMPAT_H */