integrate cfgperl changes into mainline

p4raw-id: //depot/perl@3267

diff --git a/config_h.SH b/config_h.SH
index f933c78..29a0d35 100644 (file)
--- a/config_h.SH
+++ b/config_h.SH
@@ -1087,6 +1087,22 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #define MEM_ALIGNBYTES $alignbytes
 #endif
 
+/* INTSIZE:
+ *     This symbol contains the value of sizeof(int) so that the C
+ *     preprocessor can make decisions based on it.
+ */
+/* LONGSIZE:
+ *     This symbol contains the value of sizeof(long) so that the C
+ *     preprocessor can make decisions based on it.
+ */
+/* SHORTSIZE:
+ *     This symbol contains the value of sizeof(short) so that the C
+ *     preprocessor can make decisions based on it.
+ */
+#define INTSIZE $intsize               /**/
+#define LONGSIZE $longsize             /**/
+#define SHORTSIZE $shortsize           /**/
+
 /* BYTEORDER:
  *     This symbol holds the hexadecimal constant defined in byteorder,
  *     i.e. 0x1234 or 0x4321, etc...

diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 8bf59ab..beb25c7 100644 (file)
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -448,13 +448,6 @@ to skip installing perl also as /usr/bin/perl.  This is useful if you
 prefer not to modify /usr/bin for some reason or another but harmful
 because many scripts assume to find Perl in /usr/bin/perl.
 
-=head1 Configuration Changes
-
-You can use "Configure -Uinstallusrbinperl" which causes installperl
-to skip installing perl also as /usr/bin/perl.  This is useful if you
-prefer not to modify /usr/bin for some reason or another but harmful
-because many scripts assume to find Perl in /usr/bin/perl.
-
 =head1 BUGS
 
 If you find what you think is a bug, you might check the headers of

diff --git a/pod/perlre.pod b/pod/perlre.pod
index 97ac7b7..95d4734 100644 (file)
--- a/pod/perlre.pod
+++ b/pod/perlre.pod
@@ -28,7 +28,7 @@ locale.  See L<perllocale>.
 
 Treat string as multiple lines.  That is, change "^" and "$" from matching
 at only the very start or end of the string to the start or end of any
-line anywhere within the string,
+line anywhere within the string.
 
 =item s
 

diff --git a/t/op/filetest.t b/t/op/filetest.t
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/t/op/subst_amp.t b/t/op/subst_amp.t
old mode 100644 (file)
new mode 100755 (executable)