svn commit: r609090 - in /perl/modperl/trunk: Changes src/modules/perl/modperl_perl_includes.h

[ra...@apache.org]

Author: randyk
Date: Fri Jan  4 20:46:50 2008
New Revision: 609090

URL: http://svn.apache.org/viewvc?rev=609090&view=rev
Log:
Fix problems with redefinitions of perl_free as free and perl_malloc as malloc on Win32, as described at
 http://marc.info/?l=apache-modperl&m=119896407510526&w=2
[Tom Donovan]

Modified:
    perl/modperl/trunk/Changes
    perl/modperl/trunk/src/modules/perl/modperl_perl_includes.h

Modified: perl/modperl/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/Changes?rev=609090&r1=609089&r2=609090&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Fri Jan  4 20:46:50 2008
@@ -12,6 +12,10 @@
 
 =item 2.0.4-dev
 
+Fix problems with redefinitions of perl_free as free and perl_malloc as malloc on Win32, as described at
+ http://marc.info/?l=apache-modperl&m=119896407510526&w=2
+[Tom Donovan]
+
 Fix a crash when running a sub-request from within a filter where
 mod_perl was not the content handler. [Gozer]
 

Modified: perl/modperl/trunk/src/modules/perl/modperl_perl_includes.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_perl_includes.h?rev=609090&r1=609089&r2=609090&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_perl_includes.h (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_perl_includes.h Fri Jan  4 20:46:50 2008
@@ -53,7 +53,6 @@
 #   define uid_t perl_uid_t
 #   define gid_t perl_gid_t
 #   ifdef exit
-#      define perl_exit exit
 #      undef exit
 #   endif
 #endif
@@ -68,11 +67,9 @@
 
 #if defined(WIN32) && defined(USE_LARGE_FILES)
 #   ifdef malloc
-#      define perl_malloc malloc
 #      undef malloc
 #   endif
 #   ifdef free
-#      define perl_free free
 #      undef free
 #   endif
 #endif