Change 33598 by [EMAIL PROTECTED] on 2008/03/29 11:21:46
Subject: [PATCH] Re: Smoke [5.11.0] 33456 PASS darwin 9.2.0 (macppcG5/1
cpu)
From: Dominic Dunlop <[EMAIL PROTECTED]>
Message-Id: <[EMAIL PROTECTED]>
Date: Tue, 11 Mar 2008 21:54:04 +0100
[but rename ******* to i_mallocmalloc.U, and then fix up all the files
that Porting/checkcfgvar.pl says need i_mallocmalloc declared]
Affected files ...
... //depot/perl/Configure#687 edit
... //depot/perl/Cross/config.sh-arm-linux#28 edit
... //depot/perl/NetWare/config.wc#42 edit
... //depot/perl/Porting/Glossary#189 edit
... //depot/perl/Porting/config.sh#174 edit
... //depot/perl/config_h.SH#344 edit
... //depot/perl/configure.com#282 edit
... //depot/perl/epoc/config.sh#104 edit
... //depot/perl/perl.h#835 edit
... //depot/perl/plan9/config_sh.sample#21 edit
... //depot/perl/symbian/config.sh#27 edit
... //depot/perl/uconfig.sh#84 edit
... //depot/perl/win32/config.bc#180 edit
... //depot/perl/win32/config.ce#14 edit
... //depot/perl/win32/config.gc#179 edit
... //depot/perl/win32/config.vc#188 edit
... //depot/perl/win32/config.vc64#58 edit
Differences ...
==== //depot/perl/Configure#687 (xtext) ====
Index: perl/Configure
--- perl/Configure#686~33551~ 2008-03-24 09:30:26.000000000 -0700
+++ perl/Configure 2008-03-29 04:21:46.000000000 -0700
@@ -869,6 +869,7 @@
i_locale=''
i_machcthr=''
i_malloc=''
+i_mallocmalloc=''
i_math=''
i_memory=''
i_mntent=''
@@ -6550,6 +6551,10 @@
esac
$rm -f getverlist
+: see if malloc/malloc.h has to be included
+set malloc/malloc.h i_mallocmalloc
+eval $inhdr
+
: see if this is a malloc.h system
: we want a real compile instead of Inhdr because some systems have a
: malloc.h that just gives a compile error saying to use stdlib.h instead
@@ -6557,6 +6562,11 @@
$cat >try.c <<EOCP
#include <stdlib.h>
#include <malloc.h>
+$i_mallocmalloc I_MALLOCMALLOC
+#ifdef I_MALLOCMALLOC
+# include <malloc/malloc.h>
+#endif
+
int main () { return 0; }
EOCP
set try
@@ -22353,6 +22363,7 @@
i_locale='$i_locale'
i_machcthr='$i_machcthr'
i_malloc='$i_malloc'
+i_mallocmalloc='$i_mallocmalloc'
i_math='$i_math'
i_memory='$i_memory'
i_mntent='$i_mntent'
==== //depot/perl/Cross/config.sh-arm-linux#28 (text) ====
Index: perl/Cross/config.sh-arm-linux
--- perl/Cross/config.sh-arm-linux#27~33597~ 2008-03-29 04:08:07.000000000
-0700
+++ perl/Cross/config.sh-arm-linux 2008-03-29 04:21:46.000000000 -0700
@@ -634,6 +634,7 @@
i_locale='define'
i_machcthr='undef'
i_malloc='define'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='define'
==== //depot/perl/NetWare/config.wc#42 (text) ====
Index: perl/NetWare/config.wc
--- perl/NetWare/config.wc#41~33597~ 2008-03-29 04:08:07.000000000 -0700
+++ perl/NetWare/config.wc 2008-03-29 04:21:46.000000000 -0700
@@ -617,6 +617,7 @@
i_locale='define'
i_machcthr='undef'
i_malloc='define'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='undef'
==== //depot/perl/Porting/Glossary#189 (text) ====
Index: perl/Porting/Glossary
--- perl/Porting/Glossary#188~33547~ 2008-03-21 03:28:42.000000000 -0700
+++ perl/Porting/Glossary 2008-03-29 04:21:46.000000000 -0700
@@ -2923,6 +2923,10 @@
This variable conditionally defines the I_MALLOC symbol, and indicates
whether a C program should include <malloc.h>.
+i_mallocmalloc (i_mallocmalloc.U):
+ This variable conditionally defines the I_MALLOCMALLOC symbol,
+ and indicates whether a C program should include <malloc/malloc.h>.
+
i_math (i_math.U):
This variable conditionally defines the I_MATH symbol, and indicates
whether a C program may include <math.h>.
==== //depot/perl/Porting/config.sh#174 (text) ====
Index: perl/Porting/config.sh
--- perl/Porting/config.sh#173~33597~ 2008-03-29 04:08:07.000000000 -0700
+++ perl/Porting/config.sh 2008-03-29 04:21:46.000000000 -0700
@@ -647,6 +647,7 @@
i_locale='define'
i_machcthr='undef'
i_malloc='define'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='define'
==== //depot/perl/config_h.SH#344 (text) ====
Index: perl/config_h.SH
--- perl/config_h.SH#343~33547~ 2008-03-21 03:28:42.000000000 -0700
+++ perl/config_h.SH 2008-03-29 04:21:46.000000000 -0700
@@ -689,6 +689,12 @@
*/
#$i_locale I_LOCALE /**/
+/* I_MALLOCMALLOC:
+ * This symbol, if defined, indicates to the C program that it should
+ * include <malloc/malloc.h>.
+ */
+#$i_mallocmalloc I_MALLOCMALLOC /**/
+
/* I_MATH:
* This symbol, if defined, indicates to the C program that it should
* include <math.h>.
==== //depot/perl/configure.com#282 (text) ====
Index: perl/configure.com
--- perl/configure.com#281~33591~ 2008-03-28 12:06:35.000000000 -0700
+++ perl/configure.com 2008-03-29 04:21:46.000000000 -0700
@@ -6241,6 +6241,7 @@
$ WC "i_locale='" + i_locale + "'"
$ WC "i_machcthr='undef'"
$ WC "i_machcthreads='undef'"
+$ WC "i_mallocmalloc='undef'"
$ WC "i_math='define'"
$ WC "i_memory='undef'"
$ WC "i_mntent='undef'"
==== //depot/perl/epoc/config.sh#104 (text) ====
Index: perl/epoc/config.sh
--- perl/epoc/config.sh#103~33597~ 2008-03-29 04:08:07.000000000 -0700
+++ perl/epoc/config.sh 2008-03-29 04:21:46.000000000 -0700
@@ -580,6 +580,7 @@
i_locale='undef'
i_machcthr='undef'
i_malloc='undef'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='undef'
==== //depot/perl/perl.h#835 (text) ====
Index: perl/perl.h
--- perl/perl.h#834~33448~ 2008-03-06 05:29:56.000000000 -0800
+++ perl/perl.h 2008-03-29 04:21:46.000000000 -0700
@@ -4073,6 +4073,11 @@
# define INIT_TRACK_MEMPOOL(header, interp)
#endif
+#ifdef I_MALLOCMALLOC
+/* Needed for malloc_size(), malloc_good_size() on some systems */
+# include <malloc/malloc.h>
+#endif
+
#ifdef MYMALLOC
# define Perl_safesysmalloc_size(where) Perl_malloced_size(where)
#else
==== //depot/perl/plan9/config_sh.sample#21 (text) ====
Index: perl/plan9/config_sh.sample
--- perl/plan9/config_sh.sample#20~33597~ 2008-03-29 04:08:07.000000000
-0700
+++ perl/plan9/config_sh.sample 2008-03-29 04:21:46.000000000 -0700
@@ -628,6 +628,7 @@
i_locale='define'
i_machcthr='undef'
i_malloc='undef'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='undef'
==== //depot/perl/symbian/config.sh#27 (text) ====
Index: perl/symbian/config.sh
--- perl/symbian/config.sh#26~33597~ 2008-03-29 04:08:07.000000000 -0700
+++ perl/symbian/config.sh 2008-03-29 04:21:46.000000000 -0700
@@ -555,6 +555,7 @@
i_locale='define'
i_machcthr='undef'
i_malloc='undef'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='undef'
==== //depot/perl/uconfig.sh#84 (xtext) ====
Index: perl/uconfig.sh
--- perl/uconfig.sh#83~33597~ 2008-03-29 04:08:07.000000000 -0700
+++ perl/uconfig.sh 2008-03-29 04:21:46.000000000 -0700
@@ -542,6 +542,7 @@
i_locale='undef'
i_machcthr='undef'
i_malloc='undef'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='undef'
==== //depot/perl/win32/config.bc#180 (text) ====
Index: perl/win32/config.bc
--- perl/win32/config.bc#179~33597~ 2008-03-29 04:08:07.000000000 -0700
+++ perl/win32/config.bc 2008-03-29 04:21:46.000000000 -0700
@@ -622,6 +622,7 @@
i_locale='define'
i_machcthr='undef'
i_malloc='define'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='undef'
==== //depot/perl/win32/config.ce#14 (text) ====
Index: perl/win32/config.ce
--- perl/win32/config.ce#13~33597~ 2008-03-29 04:08:07.000000000 -0700
+++ perl/win32/config.ce 2008-03-29 04:21:46.000000000 -0700
@@ -615,6 +615,7 @@
i_locale='undef'
i_machcthr='undef'
i_malloc='define'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='undef'
==== //depot/perl/win32/config.gc#179 (text) ====
Index: perl/win32/config.gc
--- perl/win32/config.gc#178~33597~ 2008-03-29 04:08:07.000000000 -0700
+++ perl/win32/config.gc 2008-03-29 04:21:46.000000000 -0700
@@ -622,6 +622,7 @@
i_locale='define'
i_machcthr='undef'
i_malloc='define'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='undef'
==== //depot/perl/win32/config.vc#188 (text) ====
Index: perl/win32/config.vc
--- perl/win32/config.vc#187~33597~ 2008-03-29 04:08:07.000000000 -0700
+++ perl/win32/config.vc 2008-03-29 04:21:46.000000000 -0700
@@ -622,6 +622,7 @@
i_locale='define'
i_machcthr='undef'
i_malloc='define'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='undef'
==== //depot/perl/win32/config.vc64#58 (text) ====
Index: perl/win32/config.vc64
--- perl/win32/config.vc64#57~33597~ 2008-03-29 04:08:07.000000000 -0700
+++ perl/win32/config.vc64 2008-03-29 04:21:46.000000000 -0700
@@ -622,6 +622,7 @@
i_locale='define'
i_machcthr='undef'
i_malloc='define'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='undef'
End of Patch.
