randyk 2004/07/10 18:31:17
Modified: glue/perl/xsbuilder/Apache/Upload Apache__Upload.h
glue/perl/xsbuilder apreq_xs_postperl.h
Log:
Reviewed by: joes
include modperl_perl_unembed.h within apreq_xs_postperl.h, so that
all xsbuilder/Apache/*/Apache_*.h files include it (needed on Win32
as Win32 Perl defines "link", which conflicts with the link member
of the apr_bucket structure).
Revision Changes Path
1.20 +0 -3
httpd-apreq-2/glue/perl/xsbuilder/Apache/Upload/Apache__Upload.h
Index: Apache__Upload.h
===================================================================
RCS file:
/home/cvs/httpd-apreq-2/glue/perl/xsbuilder/Apache/Upload/Apache__Upload.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Apache__Upload.h 8 Jul 2004 19:55:57 -0000 1.19
+++ Apache__Upload.h 11 Jul 2004 01:31:17 -0000 1.20
@@ -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"
1.39 +3 -0 httpd-apreq-2/glue/perl/xsbuilder/apreq_xs_postperl.h
Index: apreq_xs_postperl.h
===================================================================
RCS file: /home/cvs/httpd-apreq-2/glue/perl/xsbuilder/apreq_xs_postperl.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- apreq_xs_postperl.h 8 Jul 2004 19:55:57 -0000 1.38
+++ apreq_xs_postperl.h 11 Jul 2004 01:31:17 -0000 1.39
@@ -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"
