Change 33190 by [EMAIL PROTECTED] on 2008/02/02 16:22:10
Integrate:
[ 31765]
Subject: [PATCH] misc blead stuff
From: Jarkko Hietaniemi <[EMAIL PROTECTED]>
Date: Wed, 29 Aug 2007 21:04:53 -0400
Message-ID: <[EMAIL PROTECTED]>
[ 31789]
From: Jarkko Hietaniemi <[EMAIL PROTECTED]>
Subject: Re: [Fwd: Smoke [5.9.5] 31775 FAIL(m) OSF1 V5.1 (EV6/4 cpu)]
Message-ID: <[EMAIL PROTECTED]>
Message-ID: <[EMAIL PROTECTED]>
Add { } to keep all variable declarations at the start of blocks.
[ 32425]
Subject: Re: [PATCH] various RC1 nits
From: Jarkko Hietaniemi <[EMAIL PROTECTED]>
Date: Tue, 20 Nov 2007 10:51:54 -0500
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.8/perl/Makefile.micro#10 integrate
... //depot/maint-5.8/perl/deb.c#23 integrate
... //depot/maint-5.8/perl/hints/catamount.sh#3 integrate
... //depot/maint-5.8/perl/mg.c#159 integrate
... //depot/maint-5.8/perl/op.c#225 integrate
... //depot/maint-5.8/perl/perl.h#176 integrate
... //depot/maint-5.8/perl/pod/perlapi.pod#115 integrate
... //depot/maint-5.8/perl/pp.c#149 integrate
... //depot/maint-5.8/perl/pp_sys.c#158 integrate
... //depot/maint-5.8/perl/reentr.c#24 integrate
... //depot/maint-5.8/perl/reentr.pl#33 integrate
... //depot/maint-5.8/perl/regexec.c#100 integrate
... //depot/maint-5.8/perl/sv.c#375 integrate
... //depot/maint-5.8/perl/uconfig.sh#24 integrate
Differences ...
==== //depot/maint-5.8/perl/Makefile.micro#10 (text) ====
Index: perl/Makefile.micro
--- perl/Makefile.micro#9~30942~ 2007-04-13 01:27:37.000000000 -0700
+++ perl/Makefile.micro 2008-02-02 08:22:10.000000000 -0800
@@ -1,11 +1,15 @@
LD = $(CC)
+CCFLAGS = -c
DEFINES = -DPERL_CORE -DPERL_MICRO -DSTANDARD_C -DPERL_USE_SAFE_PUTENV
OPTIMIZE =
CFLAGS = $(DEFINES) $(OPTIMIZE)
+LDFLAGS =
LIBS = -lm
_O = .o
ENV = env
PERL = perl
+_X =
+RUN =
all: microperl
@@ -20,18 +24,18 @@
uuniversal$(_O) uutf8$(_O) uutil$(_O) uperlapi$(_O) uxsutils$(_O)
microperl: $(O)
- $(LD) -o $@ $(O) $(LIBS)
+ $(LD) -o $@ $(O) $(LDFLAGS) $(LIBS)
H = av.h uconfig.h cop.h cv.h embed.h embedvar.h form.h gv.h handy.h \
hv.h intrpvar.h iperlsys.h mg.h op.h opcode.h opnames.h pad.h \
patchlevel.h perl.h perlsdio.h perlvars.h perly.h pp.h \
pp_proto.h proto.h reentr.h regexp.h scope.h sv.h thrdvar.h \
- thread.h unixish.h utf8.h util.h warnings.h
+ thread.h unixish.h utf8.h util.h uudmap.h warnings.h
HE = $(H) EXTERN.h
clean:
- -rm -f $(O) microperl
+ -rm -f $(O) microperl generate_uudmap$(_X) uudmap.h
distclean: clean
@@ -56,114 +60,123 @@
# The microperl objects.
uav$(_O): $(HE) av.c
- $(CC) -c -o $@ $(CFLAGS) av.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) av.c
udeb$(_O): $(HE) deb.c
- $(CC) -c -o $@ $(CFLAGS) deb.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) deb.c
udoio$(_O): $(HE) doio.c
- $(CC) -c -o $@ $(CFLAGS) doio.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) doio.c
udoop$(_O): $(HE) doop.c
- $(CC) -c -o $@ $(CFLAGS) doop.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) doop.c
udump$(_O): $(HE) dump.c regcomp.h regnodes.h
- $(CC) -c -o $@ $(CFLAGS) dump.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) dump.c
uglobals$(_O): $(H) globals.c INTERN.h perlapi.h
- $(CC) -c -o $@ $(CFLAGS) globals.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) globals.c
ugv$(_O): $(HE) gv.c
- $(CC) -c -o $@ $(CFLAGS) gv.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) gv.c
uhv$(_O): $(HE) hv.c
- $(CC) -c -o $@ $(CFLAGS) hv.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) hv.c
umg$(_O): $(HE) mg.c
- $(CC) -c -o $@ $(CFLAGS) mg.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) mg.c
uperlmain$(_O): $(HE) miniperlmain.c
- $(CC) -c -o $@ $(CFLAGS) miniperlmain.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) miniperlmain.c
uop$(_O): $(HE) op.c keywords.h
- $(CC) -c -o $@ $(CFLAGS) -DPERL_EXTERNAL_GLOB op.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) -DPERL_EXTERNAL_GLOB op.c
ureentr$(_O): $(HE) reentr.c
- $(CC) -c -o $@ $(CFLAGS) reentr.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) reentr.c
upad$(_O): $(HE) pad.c
- $(CC) -c -o $@ $(CFLAGS) pad.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) pad.c
uperl$(_O): $(HE) perl.c
- $(CC) -c -o $@ $(CFLAGS) perl.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) perl.c
uperlio$(_O): $(HE) perlio.c
- $(CC) -c -o $@ $(CFLAGS) perlio.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) perlio.c
uperly$(_O): $(HE) perly.c
- $(CC) -c -o $@ $(CFLAGS) perly.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) perly.c
upp$(_O): $(HE) pp.c
- $(CC) -c -o $@ $(CFLAGS) pp.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) pp.c
upp_ctl$(_O): $(HE) pp_ctl.c
- $(CC) -c -o $@ $(CFLAGS) pp_ctl.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) pp_ctl.c
upp_hot$(_O): $(HE) pp_hot.c
- $(CC) -c -o $@ $(CFLAGS) pp_hot.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) pp_hot.c
upp_sys$(_O): $(HE) pp_sys.c
- $(CC) -c -o $@ $(CFLAGS) pp_sys.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) pp_sys.c
upp_pack$(_O): $(HE) pp_pack.c
- $(CC) -c -o $@ $(CFLAGS) pp_pack.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) pp_pack.c
upp_sort$(_O): $(HE) pp_sort.c
- $(CC) -c -o $@ $(CFLAGS) pp_sort.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) pp_sort.c
uregcomp$(_O): $(HE) regcomp.c regcomp.h regnodes.h INTERN.h
- $(CC) -c -o $@ $(CFLAGS) regcomp.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) regcomp.c
uregexec$(_O): $(HE) regexec.c regcomp.h regnodes.h
- $(CC) -c -o $@ $(CFLAGS) regexec.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) regexec.c
urun$(_O): $(HE) run.c
- $(CC) -c -o $@ $(CFLAGS) run.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) run.c
uscope$(_O): $(HE) scope.c
- $(CC) -c -o $@ $(CFLAGS) scope.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) scope.c
usv$(_O): $(HE) sv.c
- $(CC) -c -o $@ $(CFLAGS) sv.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) sv.c
utaint$(_O): $(HE) taint.c
- $(CC) -c -o $@ $(CFLAGS) taint.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) taint.c
utoke$(_O): $(HE) toke.c keywords.h
- $(CC) -c -o $@ $(CFLAGS) toke.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) toke.c
ulocale$(_O): $(HE) locale.c
- $(CC) -c -o $@ $(CFLAGS) locale.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) locale.c
unumeric$(_O): $(HE) numeric.c
- $(CC) -c -o $@ $(CFLAGS) numeric.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) numeric.c
umathoms$(_O): $(HE) mathoms.c
- $(CC) -c -o $@ $(CFLAGS) mathoms.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) mathoms.c
uuniversal$(_O): $(HE) universal.c XSUB.h
- $(CC) -c -o $@ $(CFLAGS) universal.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) universal.c
uutf8$(_O): $(HE) utf8.c
- $(CC) -c -o $@ $(CFLAGS) utf8.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) utf8.c
uutil$(_O): $(HE) util.c
- $(CC) -c -o $@ $(CFLAGS) util.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) util.c
uperlapi$(_O): $(HE) perlapi.c perlapi.h
- $(CC) -c -o $@ $(CFLAGS) perlapi.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) perlapi.c
uxsutils$(_O): $(HE) xsutils.c
- $(CC) -c -o $@ $(CFLAGS) xsutils.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) xsutils.c
+
+uudmap.h: generate_uudmap$(_X)
+ $(RUN) ./generate_uudmap$(_X) >uudmap.h
+
+generate_uudmap$(_O): generate_uudmap.c
+ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) generate_uudmap.c
+
+generate_uudmap$(_X): generate_uudmap$(_O)
+ $(LD) -o generate_uudmap $(LDFLAGS) generate_uudmap$(_O) $(LIBS)
# That's it, folks!
==== //depot/maint-5.8/perl/deb.c#23 (text) ====
Index: perl/deb.c
--- perl/deb.c#22~33039~ 2008-01-22 09:41:53.000000000 -0800
+++ perl/deb.c 2008-02-02 08:22:10.000000000 -0800
@@ -41,15 +41,14 @@
void
Perl_deb(pTHX_ const char *pat, ...)
{
-#ifdef DEBUGGING
va_list args;
va_start(args, pat);
+#ifdef DEBUGGING
vdeb(pat, &args);
- va_end(args);
#else
PERL_UNUSED_CONTEXT;
- PERL_UNUSED_ARG(pat);
#endif /* DEBUGGING */
+ va_end(args);
}
void
==== //depot/maint-5.8/perl/hints/catamount.sh#3 (text) ====
Index: perl/hints/catamount.sh
--- perl/hints/catamount.sh#2~32529~ 2007-11-28 05:55:58.000000000 -0800
+++ perl/hints/catamount.sh 2008-02-02 08:22:10.000000000 -0800
@@ -22,24 +22,22 @@
#
# To build:
#
-# sh Configure -des -Dusedevel
+# sh Configure -des
# make perl
#
-# The -Dusedevel is required for Perl 5.9, it is not required for the Perl
-# 5.10 sources, once they come out. "make install" won't work since it
-# assumes file globbing (see above). You can try the following manually:
+# "make install" won't work since it assumes file globbing (see above).
+# You can try the following manual way:
#
# mkdir -p /opt/perl-catamount
# mkdir -p /opt/perl-catamount/include
# mkdir -p /opt/perl-catamount/lib
-# mkdir -p /opt/perl-catamount/lib/perl5/5.9.5
+# mkdir -p /opt/perl-catamount/lib/perl5/5.10.0
# mkdir -p /opt/perl-catamount/bin
# cp *.h /opt/perl-catamount/include
# cp libperl.a /opt/perl-catamount/lib
-# cp -pr lib/* /opt/perl-catamount/lib/perl5/5.9.5
+# cp -pr lib/* /opt/perl-catamount/lib/perl5/5.10.0
# cp miniperl perl run.sh cc.sh /opt/perl-catamount/lib
#
-# (For Perl 5.10.0 do the obvious renaming above.)
# With the headers and the libperl.a you can embed Perl to your Catamount
# application, see pod/perlembed.pod. You can do for example:
#
@@ -136,9 +134,12 @@
# $0
#
# This is essentially a frontend driver for the Catamount cc.
-# We arrange for (1) the main(), exit(), _exit() being wrapped (cpp-defined)
-# catamain(), cataexit(), and _cataexit() (2) the actual main() etc. are in
-# cata.c, and cata*.o are linked in when needed (3) signals being caught
+# We arrange for
+# (1) the main(), exit(), _exit() being wrapped (cpp-defined)
+# catamain(), cataexit(), and _cataexit()
+# (2) the actual main() etc. are in cata.c, and cata*.o are
+# linked in when needed
+# (3) signals being caught
# All this mostly for being able to catch the exit status (or crash cause).
#
argv=''
@@ -147,7 +148,7 @@
exe=''
defs='-Dmain=catamain -Dexit=cataexit -D_exit=_cataexit'
argv=''
-BUILD=/wrk/jhi/[EMAIL PROTECTED]
+BUILD=$BUILD
__EOF3a__
cat >> $cc <<'__EOF3b__'
case "$1" in
==== //depot/maint-5.8/perl/mg.c#159 (text) ====
Index: perl/mg.c
--- perl/mg.c#158~32515~ 2007-11-26 15:54:05.000000000 -0800
+++ perl/mg.c 2008-02-02 08:22:10.000000000 -0800
@@ -1369,6 +1369,9 @@
#else
dTHX;
#endif
+#if defined(HAS_SIGACTION) && defined(SA_SIGINFO)
+ va_list args;
+#endif
#ifdef FAKE_PERSISTENT_SIGNAL_HANDLERS
(void) rsignal(sig, PL_csighandlerp);
if (PL_sig_ignoring[sig]) return;
@@ -1381,6 +1384,9 @@
exit(1);
#endif
#endif
+#if defined(HAS_SIGACTION) && defined(SA_SIGINFO)
+ va_start(args, sig);
+#endif
if (
#ifdef SIGILL
sig == SIGILL ||
@@ -1397,6 +1403,9 @@
(*PL_sighandlerp)(sig);
else
S_raise_signal(aTHX_ sig);
+#if defined(HAS_SIGACTION) && defined(SA_SIGINFO)
+ va_end(args);
+#endif
}
#if defined(FAKE_PERSISTENT_SIGNAL_HANDLERS) ||
defined(FAKE_DEFAULT_SIGNAL_HANDLERS)
==== //depot/maint-5.8/perl/op.c#225 (text) ====
Index: perl/op.c
--- perl/op.c#224~33184~ 2008-02-02 05:33:43.000000000 -0800
+++ perl/op.c 2008-02-02 08:22:10.000000000 -0800
@@ -3425,7 +3425,7 @@
PL_modcount = 0;
/* Grandfathering $[ assignment here. Bletch.*/
/* Only simple assignments like C<< ($[) = 1 >> are allowed */
- PL_eval_start = (left->op_type == OP_CONST) ? right : 0;
+ PL_eval_start = (left->op_type == OP_CONST) ? right : NULL;
left = mod(left, OP_AASSIGN);
if (PL_eval_start)
PL_eval_start = 0;
==== //depot/maint-5.8/perl/perl.h#176 (text) ====
Index: perl/perl.h
--- perl/perl.h#175~33180~ 2008-02-01 14:57:38.000000000 -0800
+++ perl/perl.h 2008-02-02 08:22:10.000000000 -0800
@@ -2585,6 +2585,7 @@
* have HASATTRIBUTE_FORMAT).
*/
+#ifndef PERL_MICRO
#if defined __GNUC__ && !defined(__INTEL_COMPILER)
# if __GNUC__ >= 3 /* 3.0 -> */ /* XXX Verify this version */
# define HASATTRIBUTE_FORMAT
@@ -2614,6 +2615,7 @@
# define HASATTRIBUTE_WARN_UNUSED_RESULT
# endif
#endif
+#endif /* #ifndef PERL_MICRO */
/*
* USE_5005THREADS needs to be after unixish.h as <pthread.h> includes
==== //depot/maint-5.8/perl/pod/perlapi.pod#115 (text+w) ====
Index: perl/pod/perlapi.pod
--- perl/pod/perlapi.pod#114~33180~ 2008-02-01 14:57:38.000000000 -0800
+++ perl/pod/perlapi.pod 2008-02-02 08:22:10.000000000 -0800
@@ -4863,11 +4863,11 @@
Creates a new SV with its SvPVX_const pointing to a shared string in the string
table. If the string does not already exist in the table, it is created
-first. Turns on READONLY and FAKE. The string's hash is stored in the UV
-slot of the SV; if the C<hash> parameter is non-zero, that value is used;
-otherwise the hash is computed. The idea here is that as the string table
-is used for shared hash keys these strings will have SvPVX_const == HeKEY and
-hash lookup will avoid string compare.
+first. Turns on READONLY and FAKE. If the C<hash> parameter is non-zero, that
+value is used; otherwise the hash is computed. The string's hash can be later
+be retrieved from the SV with the C<SvSHARED_HASH()> macro. The idea here is
+that as the string table is used for shared hash keys these strings will have
+SvPVX_const == HeKEY and hash lookup will avoid string compare.
SV* newSVpvn_share(const char* s, I32 len, U32 hash)
==== //depot/maint-5.8/perl/pp.c#149 (text) ====
Index: perl/pp.c
--- perl/pp.c#148~32545~ 2007-11-28 15:35:51.000000000 -0800
+++ perl/pp.c 2008-02-02 08:22:10.000000000 -0800
@@ -4100,7 +4100,7 @@
if (realhv) {
HE *he = hv_fetch_ent(hv, keysv, lval, 0);
- svp = he ? &HeVAL(he) : 0;
+ svp = he ? &HeVAL(he) : NULL;
}
else {
svp = avhv_fetch_ent((AV*)hv, keysv, lval, 0);
==== //depot/maint-5.8/perl/pp_sys.c#158 (text) ====
Index: perl/pp_sys.c
--- perl/pp_sys.c#157~32528~ 2007-11-28 04:54:17.000000000 -0800
+++ perl/pp_sys.c 2008-02-02 08:22:10.000000000 -0800
@@ -461,7 +461,7 @@
}
else {
tmpsv = TOPs;
- tmps = SvROK(tmpsv) ? NULL : SvPV_const(tmpsv, len);
+ tmps = SvROK(tmpsv) ? (const char *)NULL : SvPV_const(tmpsv, len);
}
if (!tmps || !len) {
SV * const error = ERRSV;
==== //depot/maint-5.8/perl/reentr.c#24 (text) ====
Index: perl/reentr.c
--- perl/reentr.c#23~30239~ 2007-02-12 12:04:15.000000000 -0800
+++ perl/reentr.c 2008-02-02 08:22:10.000000000 -0800
@@ -307,6 +307,9 @@
{
dTHX;
void *retptr = NULL;
+ va_list ap;
+ va_start(ap, f);
+ {
#ifdef USE_REENTRANT_API
# if defined(USE_HOSTENT_BUFFER) || defined(USE_GRENT_BUFFER) ||
defined(USE_NETENT_BUFFER) || defined(USE_PWENT_BUFFER) ||
defined(USE_PROTOENT_BUFFER) || defined(USE_SERVENT_BUFFER)
void *p0;
@@ -320,9 +323,6 @@
# if defined(USE_HOSTENT_BUFFER) || defined(USE_NETENT_BUFFER) ||
defined(USE_PROTOENT_BUFFER) || defined(USE_SERVENT_BUFFER)
int anint;
# endif
- va_list ap;
-
- va_start(ap, f);
switch (PL_op->op_type) {
#ifdef USE_HOSTENT_BUFFER
@@ -525,11 +525,11 @@
/* Not known how to retry, so just fail. */
break;
}
-
- va_end(ap);
#else
PERL_UNUSED_ARG(f);
#endif
+ }
+ va_end(ap);
return retptr;
}
==== //depot/maint-5.8/perl/reentr.pl#33 (text) ====
Index: perl/reentr.pl
--- perl/reentr.pl#32~30239~ 2007-02-12 12:04:15.000000000 -0800
+++ perl/reentr.pl 2008-02-02 08:22:10.000000000 -0800
@@ -946,6 +946,9 @@
{
dTHX;
void *retptr = NULL;
+ va_list ap;
+ va_start(ap, f);
+ {
#ifdef USE_REENTRANT_API
# if defined(USE_HOSTENT_BUFFER) || defined(USE_GRENT_BUFFER) ||
defined(USE_NETENT_BUFFER) || defined(USE_PWENT_BUFFER) ||
defined(USE_PROTOENT_BUFFER) || defined(USE_SERVENT_BUFFER)
void *p0;
@@ -959,9 +962,6 @@
# if defined(USE_HOSTENT_BUFFER) || defined(USE_NETENT_BUFFER) ||
defined(USE_PROTOENT_BUFFER) || defined(USE_SERVENT_BUFFER)
int anint;
# endif
- va_list ap;
-
- va_start(ap, f);
switch (PL_op->op_type) {
#ifdef USE_HOSTENT_BUFFER
@@ -1164,11 +1164,11 @@
/* Not known how to retry, so just fail. */
break;
}
-
- va_end(ap);
#else
PERL_UNUSED_ARG(f);
#endif
+ }
+ va_end(ap);
return retptr;
}
==== //depot/maint-5.8/perl/regexec.c#100 (text) ====
Index: perl/regexec.c
--- perl/regexec.c#99~33176~ 2008-02-01 13:03:39.000000000 -0800
+++ perl/regexec.c 2008-02-02 08:22:10.000000000 -0800
@@ -4040,8 +4040,8 @@
* documentation of these array elements. */
si = *ary;
- a = SvROK(ary[1]) ? &ary[1] : 0;
- b = SvTYPE(ary[2]) == SVt_PVAV ? &ary[2] : 0;
+ a = SvROK(ary[1]) ? &ary[1] : NULL;
+ b = SvTYPE(ary[2]) == SVt_PVAV ? &ary[2] : NULL;
if (a)
sw = *a;
==== //depot/maint-5.8/perl/sv.c#375 (text) ====
Index: perl/sv.c
--- perl/sv.c#374~33180~ 2008-02-01 14:57:38.000000000 -0800
+++ perl/sv.c 2008-02-02 08:22:10.000000000 -0800
@@ -4868,7 +4868,7 @@
if (PL_utf8cache) {
STRLEN ulen;
- MAGIC *mg = SvMAGICAL(sv) ? mg_find(sv, PERL_MAGIC_utf8) : 0;
+ MAGIC *mg = SvMAGICAL(sv) ? mg_find(sv, PERL_MAGIC_utf8) : NULL;
if (mg && mg->mg_len != -1) {
ulen = mg->mg_len;
==== //depot/maint-5.8/perl/uconfig.sh#24 (xtext) ====
Index: perl/uconfig.sh
--- perl/uconfig.sh#23~32409~ 2007-11-19 10:38:44.000000000 -0800
+++ perl/uconfig.sh 2008-02-02 08:22:10.000000000 -0800
@@ -5,8 +5,8 @@
afsroot='/afs'
alignbytes='4'
aphostname='/bin/hostname'
-archlib='/usr/local/lib/perl5/5.9/unknown'
-archlibexp='/usr/local/lib/perl5/5.9/unknown'
+archlib='/usr/local/lib/perl5/5.10/unknown'
+archlibexp='/usr/local/lib/perl5/5.10/unknown'
archname='unknown'
asctime_r_proto='0'
bin='/usr/local/bin'
@@ -645,8 +645,8 @@
package='perl5'
phostname='hostname'
pidtype=int
-privlib='/usr/local/lib/perl5/5.9'
-privlibexp='/usr/local/lib/perl5/5.9'
+privlib='/usr/local/lib/perl5/5.10'
+privlibexp='/usr/local/lib/perl5/5.10'
procselfexe=''
prototype='undef'
ptrsize='4'
@@ -692,11 +692,11 @@
sig_num_init='0'
sig_size='1'
signal_t=int
-sitearch='/usr/local/lib/perl5/5.9/unknown'
-sitearchexp='/usr/local/lib/perl5/5.9/unknown'
-sitelib='/usr/local/lib/perl5/5.9'
+sitearch='/usr/local/lib/perl5/5.10/unknown'
+sitearchexp='/usr/local/lib/perl5/5.10/unknown'
+sitelib='/usr/local/lib/perl5/5.10'
sitelib_stem='/usr/local/lib/perl5'
-sitelibexp='/usr/local/lib/perl5/5.9'
+sitelibexp='/usr/local/lib/perl5/5.10'
sizesize=4
sizetype='size_t'
socksizetype='int'
End of Patch.
