You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by do...@apache.org on 2002/05/11 20:55:41 UTC
cvs commit: modperl-2.0/src/modules/perl modperl_apache_includes.h modperl_perl_includes.h modperl_perl_unembed.h
dougm 02/05/11 11:55:41
Modified: lib/Apache Build.pm
src/modules/perl modperl_apache_includes.h
modperl_perl_includes.h modperl_perl_unembed.h
Log:
fixes to compile with bleedperl on win32
Revision Changes Path
1.80 +1 -0 modperl-2.0/lib/Apache/Build.pm
Index: Build.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- Build.pm 7 Apr 2002 02:56:52 -0000 1.79
+++ Build.pm 11 May 2002 18:55:41 -0000 1.80
@@ -718,6 +718,7 @@
#when we use a bit of MakeMaker, make it use our values for these vars
my %perl_config_pm_alias = (
PERL => 'perlpath',
+ PERLRUN => 'perlpath',
PERL_LIB => 'privlibexp',
PERL_ARCHLIB => 'archlibexp',
);
1.12 +0 -26 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- modperl_apache_includes.h 16 Apr 2002 01:39:22 -0000 1.11
+++ modperl_apache_includes.h 11 May 2002 18:55:41 -0000 1.12
@@ -7,32 +7,6 @@
#define CORE_PRIVATE
#endif
-#ifdef WIN32
-# include <winsock2.h>
-# include <malloc.h>
-# include <win32.h>
-# include <win32iop.h>
-# undef errno
-# undef read
-# include <fcntl.h>
-# include "EXTERN.h"
-# include "perl.h"
-
-# include "modperl_perl_unembed.h"
-
-# ifdef uid_t
-# define apache_uid_t uid_t
-# undef uid_t
-# endif
-# define uid_t apache_uid_t
-
-# ifdef gid_t
-# define apache_gid_t gid_t
-# undef gid_t
-# endif
-# define gid_t apache_gid_t
-#endif /* WIN32 */
-
#include "ap_mmn.h"
#include "httpd.h"
#include "http_config.h"
1.11 +5 -0 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- modperl_perl_includes.h 16 Apr 2002 01:39:22 -0000 1.10
+++ modperl_perl_includes.h 11 May 2002 18:55:41 -0000 1.11
@@ -31,6 +31,11 @@
# endif
#endif
+#ifdef WIN32
+# define uid_t perl_uid_t
+# define gid_t perl_gid_t
+#endif
+
#include "EXTERN.h"
#include "perl.h"
#include "XSUB.h"
1.2 +4 -1 modperl-2.0/src/modules/perl/modperl_perl_unembed.h
Index: modperl_perl_unembed.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_perl_unembed.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- modperl_perl_unembed.h 16 Apr 2002 01:39:22 -0000 1.1
+++ modperl_perl_unembed.h 11 May 2002 18:55:41 -0000 1.2
@@ -19,7 +19,10 @@
#undef read
#undef free
/* modperl_perl.c */
-#undef getpid
+#ifdef WIN32
+# undef getpid
+# undef getenv
+#endif
#undef list