httpd-apreq-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Randy Kobes <ra...@theoryx5.uwinnipeg.ca>
Subject [apreq-2] link conflict
Date Sat, 10 Jul 2004 22:50:01 GMT
There was a problem a while ago for Win32 in
Apache__Upload.h, in that Win32 defined "link" which clashed
with the "link" member of the apr_bucket struct. This was
gotten around by including modperl_perl_unembed.h in
Apache__Upload.h. The same problem now arises in
Apache__Request.h - the following patch:
===========================================================
Index: glue/perl/xsbuilder/Apache/Upload/Apache__Upload.h
===================================================================
RCS file: /home/cvs/httpd-apreq-2/glue/perl/xsbuilder/Apache/Upload/Apache__Upload.h,v
retrieving revision 1.19
diff -u -r1.19 Apache__Upload.h
--- glue/perl/xsbuilder/Apache/Upload/Apache__Upload.h	8 Jul 2004 19:55:57 -0000	1.19
+++ glue/perl/xsbuilder/Apache/Upload/Apache__Upload.h	10 Jul 2004 22:17:24 -0000
@@ -16,9 +16,6 @@

 #include "apreq_xs_tables.h"

-/* avoid namespace collisions from perl's XSUB.h */
-#include "modperl_perl_unembed.h"
-
 /* XXX modperl_* dependency for T_HASHOBJ support */
 #include "modperl_common_util.h"

Index: glue/perl/xsbuilder/apreq_xs_postperl.h
===================================================================
RCS file: /home/cvs/httpd-apreq-2/glue/perl/xsbuilder/apreq_xs_postperl.h,v
retrieving revision 1.38
diff -u -r1.38 apreq_xs_postperl.h
--- glue/perl/xsbuilder/apreq_xs_postperl.h	8 Jul 2004 19:55:57 -0000	1.38
+++ glue/perl/xsbuilder/apreq_xs_postperl.h	10 Jul 2004 22:17:24 -0000
@@ -17,6 +17,9 @@
 #ifndef APREQ_XS_POSTPERL_H
 #define APREQ_XS_POSTPERL_H

+/* avoid namespace collisions from perl's XSUB.h */
+#include "modperl_perl_unembed.h"
+
 /* backward compatibility macros support */
 #include "ppport.h"

============================================================
includes modperl_perl_umembed.h from apreq_xs_postperl.h,
so that all the Apache__*.h files get it.

-- 
best regards,
randy

Mime
View raw message