dougm 02/04/15 18:39:22
Modified: src/modules/perl modperl_apache_includes.h
modperl_perl_includes.h
Added: src/modules/perl modperl_perl_unembed.h
Log:
need to avoid namespace problems in both modperl_{perl,apache}_includes.h
move fixups to modperl_perl_unembed.h and include it in both places
Revision Changes Path
1.11 +2 -1 modperl-2.0/src/modules/perl/modperl_apache_includes.h
Index: modperl_apache_includes.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_apache_includes.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- modperl_apache_includes.h 9 Apr 2002 17:00:14 -0000 1.10
+++ modperl_apache_includes.h 16 Apr 2002 01:39:22 -0000 1.11
@@ -17,7 +17,8 @@
# include <fcntl.h>
# include "EXTERN.h"
# include "perl.h"
-# undef list
+
+# include "modperl_perl_unembed.h"
# ifdef uid_t
# define apache_uid_t uid_t
1.10 +1 -23 modperl-2.0/src/modules/perl/modperl_perl_includes.h
Index: modperl_perl_includes.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_perl_includes.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- modperl_perl_includes.h 23 Dec 2001 05:46:29 -0000 1.9
+++ modperl_perl_includes.h 16 Apr 2002 01:39:22 -0000 1.10
@@ -39,29 +39,7 @@
# define MP_PERL_5_6_1
#endif
-#ifdef PERL_CORE
-# ifndef croak
-# define croak Perl_croak_nocontext
-# endif
-#endif
-
-/* avoiding namespace collisions */
-
-/* from XSUB.h */
-/* mod_perl.c calls exit() in a few places */
-#undef exit
-/* modperl_tipool.c references abort() */
-#undef abort
-/* these three clash with apr bucket structure member names */
-#undef link
-#undef read
-#undef free
-/* modperl_perl.c */
-#undef getpid
-
-#ifdef list
-# undef list
-#endif
+#include "modperl_perl_unembed.h"
/* avoiding -Wall warning */
1.1 modperl-2.0/src/modules/perl/modperl_perl_unembed.h
Index: modperl_perl_unembed.h
===================================================================
#ifndef MODPERL_PERL_UNEMBED_H
#define MODPERL_PERL_UNEMBED_H
#ifdef PERL_CORE
# ifndef croak
# define croak Perl_croak_nocontext
# endif
#endif
/* avoiding namespace collisions */
/* from XSUB.h */
/* mod_perl.c calls exit() in a few places */
#undef exit
/* modperl_tipool.c references abort() */
#undef abort
/* these three clash with apr bucket structure member names */
#undef link
#undef read
#undef free
/* modperl_perl.c */
#undef getpid
#undef list
#endif /* MODPERL_PERL_UNEMBED_H */
