Integrate:

[ 23022]
The microperl config didn't know about usemallocwrap yet.

[ 23027]
More microperl tweaks.
p4raw-link: @23027 on //depot/perl: ad5a63fe9396219f88b25d62a50a1bc7fb7f0c96
p4raw-link: @23022 on //depot/perl: 6f980a54574e0bf71b1f27e663d5e95cbb8a2612

p4raw-id: //depot/maint-5.8/perl@23039
p4raw-integrated: from //depot/perl@23038 'copy in' Makefile.micro
	(@20646..) README.micro (@20651..)
p4raw-integrated: from //depot/perl@23022 'ignore' uconfig.h uconfig.sh
	(@22334..)

4 files changed, 46 insertions, 15 deletions

diff --git a/Makefile.micro b/Makefile.micro
index b509448aeb..735215ba28 100644
--- a/Makefile.micro
+++ b/Makefile.micro
@@ -33,11 +33,10 @@ clean:
 	-rm -f $(O) microperl
 
 distclean:	clean
-	-rm -f uconfig.h
 
 # The microconfiguration.
 
-uconfig.h:	uconfig.sh config_h.SH
+regen_uconfig:
 	$(ENV) CONFIG_SH=uconfig.sh CONFIG_H=uconfig.h sh ./config_h.SH
 
 # Do not regenerate perly.c and perly.h.
diff --git a/README.micro b/README.micro
index 7f12c70a17..d4b2628962 100644
--- a/README.micro
+++ b/README.micro
@@ -1,4 +1,4 @@
-microperl is supposed to be able a really minimal perl, even more
+microperl is supposed to be a really minimal perl, even more
 minimal than miniperl.  No Configure is needed to build microperl,
 on the other hand this means that interfaces between Perl and your
 operating system are left very -- minimal.
@@ -20,6 +20,8 @@ If you are still reading this and you are itching to try out microperl:
 
 	make -f Makefile.micro
 
+If you make changes to uconfig.sh, run
 
+	make -f Makefile.micro regen_uconfig
 
-
+to regenerate uconfig.h.
diff --git a/uconfig.h b/uconfig.h
index aa16a5b80f..a81a24055f 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -1338,8 +1338,8 @@
  *	This symbol contains the ~name expanded version of ARCHLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-/*#define ARCHLIB "/usr/local/lib/perl5/5.7/unknown"		/ **/
-/*#define ARCHLIB_EXP "/usr/local/lib/perl5/5.7/unknown"		/ **/
+/*#define ARCHLIB "/usr/local/lib/perl5/5.9/unknown"		/ **/
+/*#define ARCHLIB_EXP "/usr/local/lib/perl5/5.9/unknown"		/ **/
 
 /* BIN:
  *	This symbol holds the path of the bin directory where the package will
@@ -1377,6 +1377,18 @@
  */
 /*#define PERL_OTHERLIBDIRS ""		/ **/
 
+/* INSTALL_PREFIX:
+ *	This symbol contains the "root" of installation tree for this package.
+ *	The program should be prepared to do ~ expansion.
+ */
+/* INSTALL_PREFIX_EXP:
+ *	This symbol contains the "root" of installation tree for this package
+ *	to be used in programs that are not prepared to deal with ~ expansion
+ *	at run-time.
+ */
+#define INSTALL_PREFIX ""		/**/
+#define INSTALL_PREFIX_EXP ""	/**/
+
 /* PRIVLIB:
  *	This symbol contains the name of the private library for this package.
  *	The library is private in the sense that it needn't be in anyone's
@@ -1387,8 +1399,8 @@
  *	This symbol contains the ~name expanded version of PRIVLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define PRIVLIB "/usr/local/lib/perl5/5.7"		/**/
-#define PRIVLIB_EXP "/usr/local/lib/perl5/5.7"		/**/
+#define PRIVLIB "/usr/local/lib/perl5/5.9"		/**/
+#define PRIVLIB_EXP "/usr/local/lib/perl5/5.9"		/**/
 
 /* SITEARCH:
  *	This symbol contains the name of the private library for this package.
@@ -2150,6 +2162,11 @@
  */
 /*#define MYMALLOC			/ **/
 
+/* PERL_MALLOC_WRAP:
+ *	This symbol, if defined, indicates that we'd like malloc wrap checks.
+ */
+/*#define PERL_MALLOC_WRAP			/ **/
+
 /* CAN_PROTOTYPE:
  *	If defined, this macro indicates that the C compiler can handle
  *	function prototypes.
@@ -3204,6 +3221,19 @@
 #define	NVSIZE		8		/**/
 #undef	NV_PRESERVES_UV
 #define	NV_PRESERVES_UV_BITS	0
+#if UVSIZE == 8
+#   ifdef BYTEORDER
+#       if BYTEORDER == 0x1234
+#           undef BYTEORDER
+#           define BYTEORDER 0x12345678
+#       else
+#           if BYTEORDER == 0x4321
+#               undef BYTEORDER
+#               define BYTEORDER 0x87654321
+#           endif
+#       endif
+#   endif
+#endif
 
 /* IVdf:
  *	This symbol defines the format string used for printing a Perl IV
@@ -4235,7 +4265,7 @@
  *	unsigned long, int, etc.  It may be necessary to include
  *	<sys/types.h> to get any typedef'ed information.
  */
-#define Size_t int	 /* length paramater for string functions */
+#define Size_t size_t	 /* length paramater for string functions */
 
 /* Uid_t_f:
  *	This symbol defines the format string used for printing a Uid_t.
diff --git a/uconfig.sh b/uconfig.sh
index 3fb16b78d1..87be639524 100755
--- a/uconfig.sh
+++ b/uconfig.sh
@@ -4,9 +4,8 @@ _o='.o'
 afs='false'
 afsroot='/afs'
 alignbytes='4'
-apiversion='5.005'
-archlib='/usr/local/lib/perl5/5.7/unknown'
-archlibexp='/usr/local/lib/perl5/5.7/unknown'
+archlib='/usr/local/lib/perl5/5.9/unknown'
+archlibexp='/usr/local/lib/perl5/5.9/unknown'
 archname='unknown'
 asctime_r_proto='0'
 bin='/usr/local/bin'
@@ -598,8 +597,8 @@ orderlib='false'
 osname='unknown'
 phostname='hostname'
 pidtype=int
-privlib='/usr/local/lib/perl5/5.7'
-privlibexp='/usr/local/lib/perl5/5.7'
+privlib='/usr/local/lib/perl5/5.9'
+privlibexp='/usr/local/lib/perl5/5.9'
 procselfexe=''
 prototype='undef'
 ptrsize='4'
@@ -645,7 +644,7 @@ sig_num_init='0'
 sig_size='1'
 signal_t=int
 sizesize=4
-sizetype=int
+sizetype='size_t'
 socksizetype='int'
 srand48_r_proto='0'
 srandom_r_proto='0'
@@ -684,6 +683,7 @@ usefaststdio='undef'
 useithreads='undef'
 uselargefiles='undef'
 uselongdouble='undef'
+usemallocwrap='undef'
 usemorebits='undef'
 usemultiplicity='undef'
 usemymalloc='n'