You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-cvs@httpd.apache.org by ji...@apache.org on 2001/01/03 04:58:57 UTC
cvs commit: httpd-apreq/c apache_multipart_buffer.c apache_request.h
jimw 01/01/02 19:58:56
Modified: . Changes
Cookie Cookie.xs Makefile.PL
Request Makefile.PL Request.xs
c apache_multipart_buffer.c apache_request.h
Log:
* If compiling using a non-gcc compiler the gcc __attribute__ feature
gets defined twice, once by apache headers and once by perl headers.
The patch undefs it inbetween so the compiler does not barf because of
the redefinition.
* The function my_memstr c/apache_multipart_buffer.c attempts to perform
pointer arithmetic on void * variables, which does not work in
standard C as a void * has no size. I changed the pointers to unsigned
char *.
* The header file apache_request.h does use a C++ comment which produces
warning in a normal C compiler about extra garbage at the end of an
#endif pre-processor statement, making this a C comment avoids the
warning.
* AIX needs extra linker flags to cope with the special .exp file
mechanism that defines the symbols to export for a dynamic shared
object/shared library. The Apache::src module has a convenient method
to retrieve these flags if needed.
Submitted by: Jens-Uwe Mager <ju...@helios.de>
Revision Changes Path
1.25 +4 -0 httpd-apreq/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/httpd-apreq/Changes,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Changes 2000/12/23 02:40:52 1.24
+++ Changes 2001/01/03 03:58:52 1.25
@@ -2,6 +2,10 @@
=over 4
+=item 0.32 - ?
+
+AIX compile fixes [Jens-Uwe Mager <ju...@helios.de>]
+
=item 0.31_03 - December 23, 2000
Apache::Request->instance [Matt Sergeant <ma...@sergeant.org>]
1.4 +1 -0 httpd-apreq/Cookie/Cookie.xs
Index: Cookie.xs
===================================================================
RCS file: /home/cvs/httpd-apreq/Cookie/Cookie.xs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Cookie.xs 2000/03/30 04:49:14 1.3
+++ Cookie.xs 2001/01/03 03:58:53 1.4
@@ -1,5 +1,6 @@
#include "apache_request.h"
#include "apache_cookie.h"
+#undef __attribute__
#include "mod_perl.h"
typedef ApacheCookie * Apache__Cookie;
1.2 +3 -0 httpd-apreq/Cookie/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/httpd-apreq/Cookie/Makefile.PL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.PL 1999/01/27 01:33:20 1.1
+++ Makefile.PL 2001/01/03 03:58:53 1.2
@@ -28,6 +28,9 @@
'INC' => "-I../c ". $src->inc,
'TYPEMAPS' => $src->typemaps,
'LIBS' => "-L$root -lapreq",
+ 'dynamic_lib' => {
+ 'OTHERLDFLAGS' => $src->otherldflags,
+ },
);
unlink "$root/libapreq.a";
}
1.2 +3 -0 httpd-apreq/Request/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/httpd-apreq/Request/Makefile.PL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.PL 1999/01/27 01:33:20 1.1
+++ Makefile.PL 2001/01/03 03:58:54 1.2
@@ -28,6 +28,9 @@
'INC' => "-I../c ". $src->inc,
'TYPEMAPS' => $src->typemaps,
'LIBS' => "-L$root -lapreq",
+ 'dynamic_lib' => {
+ 'OTHERLDFLAGS' => $src->otherldflags,
+ },
);
unlink "$root/libapreq.a";
}
1.5 +1 -0 httpd-apreq/Request/Request.xs
Index: Request.xs
===================================================================
RCS file: /home/cvs/httpd-apreq/Request/Request.xs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Request.xs 1999/05/13 20:43:34 1.4
+++ Request.xs 2001/01/03 03:58:54 1.5
@@ -1,4 +1,5 @@
#include "apache_request.h"
+#undef __attribute__
#include "mod_perl.h"
typedef ApacheRequest * Apache__Request;
1.4 +2 -2 httpd-apreq/c/apache_multipart_buffer.c
Index: apache_multipart_buffer.c
===================================================================
RCS file: /home/cvs/httpd-apreq/c/apache_multipart_buffer.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apache_multipart_buffer.c 2000/12/19 00:21:57 1.3
+++ apache_multipart_buffer.c 2001/01/03 03:58:56 1.4
@@ -69,12 +69,12 @@
{
int needlen = strlen(needle);
int len = haystacklen;
- void *ptr = haystack;
+ unsigned char *ptr = haystack;
/* iterate through first character matches */
while( (ptr = memchr(ptr, needle[0], len)) ) {
/* calculate length after match */
- len = haystacklen - (ptr - haystack);
+ len = haystacklen - (ptr - (unsigned char *)haystack);
/* done if matches up to capacity of buffer */
if(memcmp(needle, ptr, needlen < len ? needlen : len) == 0 &&
1.4 +1 -1 httpd-apreq/c/apache_request.h
Index: apache_request.h
===================================================================
RCS file: /home/cvs/httpd-apreq/c/apache_request.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apache_request.h 2000/03/30 05:03:29 1.3
+++ apache_request.h 2001/01/03 03:58:56 1.4
@@ -102,4 +102,4 @@
#define REQ_DEBUG(a)
#endif
-#endif // _APACHE_REQUEST_H
+#endif /* _APACHE_REQUEST_H */