Rely on C89 <string.h> in Perl-specific units

diff --git a/U/compline/d_gconvert.U b/U/compline/d_gconvert.U
index 3ee4406..2c42dc7 100644 (file)
--- a/U/compline/d_gconvert.U
+++ b/U/compline/d_gconvert.U
@@ -22,7 +22,7 @@
 ?RCS: patch36: created by ADO
 ?RCS:
 ?MAKE:d_Gconvert: \
-       Compile cat Inlibc rm _o rm_try i_stdlib i_string d_qgcvt run \
+       Compile cat Inlibc rm _o rm_try i_stdlib d_qgcvt run \
        uselongdouble d_longdbl d_PRIgldbl sPRIgldbl
 ?MAKE: -pick add $@ %<
 ?S:d_Gconvert:
@@ -124,12 +124,7 @@ char *myname = "sprintf";
 #ifdef I_STDLIB
 #include <stdlib.h>
 #endif
-#$i_string I_STRING
-#ifdef I_STRING
-#  include <string.h>
-#else
-#  include <strings.h>
-#endif
+#include <string.h>
 
 int checkit(char *expect, char *got)
 {

diff --git a/U/compline/nblock_io.U b/U/compline/nblock_io.U
index 74a1072..a82a45b 100644 (file)
--- a/U/compline/nblock_io.U
+++ b/U/compline/nblock_io.U
@@ -23,7 +23,7 @@
 ?X:
 ?MAKE:o_nonblock eagain rd_nodata d_eofnblk: cat rm_try Compile run \
        d_open3 h_sysfile h_fcntl signal_t hint Oldconfig Setvar \
-       startsh i_unistd i_string i_fcntl i_stdlib d_fork d_pipe d_alarm
+       startsh i_unistd i_fcntl i_stdlib d_fork d_pipe d_alarm
 ?MAKE: -pick add $@ %<
 ?S:o_nonblock:
 ?S:    This variable bears the symbol value to be used during open() or fcntl()
@@ -162,12 +162,7 @@ extern int errno;
 #ifdef I_UNISTD
 #include <unistd.h>
 #endif
-#$i_string I_STRING
-#ifdef I_STRING
 #include <string.h>
-#else
-#include <strings.h>
-#endif
 $signal_t blech(int x) { exit(3); }
 EOCP
        $cat >> try.c <<'EOCP'

diff --git a/U/perl/infnan.U b/U/perl/infnan.U
index 2d8419a..8d95579 100644 (file)
--- a/U/perl/infnan.U
+++ b/U/perl/infnan.U
@@ -6,7 +6,7 @@
 ?RCS: License or the Artistic License, as specified in the README file.
 ?RCS:
 ?MAKE:longdblinfbytes longdblnanbytes doubleinfbytes doublenanbytes: Inlibc \
-       cat i_string Compile run rm_try Setvar echo d_longdbl \
+       cat Compile run rm_try Setvar echo d_longdbl \
        doublekind doublesize longdblkind longdblsize
 ?MAKE: -pick add $@ %<
 ?S:longdblinfbytes:
@@ -57,11 +57,8 @@ $cat >try.c <<EOP
 #define LONG_DOUBLESIZE $longdblsize
 #define LONG_DOUBLEKIND $longdblkind
 #endif
-#$i_string I_STRING
 #include <math.h>
-#ifdef I_STRING
-#  include <string.h>
-#endif
+#include <string.h>
 #include <stdio.h>
 /* Note that whether the sign bit is on or off
  * for NaN depends on the CPU/FPU, and possibly

diff --git a/U/perl/perlxv.U b/U/perl/perlxv.U
index a9ab082..9f198cf 100644 (file)
--- a/U/perl/perlxv.U
+++ b/U/perl/perlxv.U
@@ -12,7 +12,7 @@
       d_nv_zero_is_allbits_zero: \
        echo rm_try use64bitint d_quad quadtype uquadtype usequadmath \
        d_longdbl uselongdouble longdblsize doublesize i_quadmath \
-       shortsize intsize longsize i_stdlib i_string libs gccversion \
+       shortsize intsize longsize i_stdlib libs gccversion \
        cat Compile i_inttypes test signal_t run
 ?MAKE: -pick add $@ %<
 ?S:ivtype:
@@ -575,12 +575,7 @@ $cat <<EOP >try.c
 #ifdef I_STDLIB
 #include <stdlib.h>
 #endif
-#$i_string I_STRING
-#ifdef I_STRING
-#  include <string.h>
-#else
-#  include <strings.h>
-#endif
+#include <string.h>
 #include <sys/types.h>
 #include <signal.h>
 #ifdef SIGFPE

diff --git a/U/threads/d_localtime_r.U b/U/threads/d_localtime_r.U
index f7f3aa0..d944f89 100644 (file)
--- a/U/threads/d_localtime_r.U
+++ b/U/threads/d_localtime_r.U
@@ -9,7 +9,7 @@
 ?RCS:
 ?MAKE:d_localtime_r d_localtime_r_needs_tzset localtime_r_proto: Inlibc \
        cat run Protochk Hasproto i_systypes usethreads i_time i_systime \
-       rm_try Compile extern_C i_stdlib i_unistd i_string i_malloc
+       rm_try Compile extern_C i_stdlib i_unistd i_malloc
 ?MAKE: -pick add $@ %<
 ?S:d_localtime_r:
 ?S:    This variable conditionally defines the HAS_LOCALTIME_R symbol,
@@ -113,7 +113,6 @@ REENTRANT_PROTO*)
 #$i_unistd     I_UNISTD
 #$i_time       I_TIME
 #$i_stdlib     I_STDLIB
-#$i_string     I_STRING
 #$i_malloc     I_MALLOC
 #ifdef I_SYS_TYPES
 #  include <sys/types.h>
@@ -127,11 +126,7 @@ REENTRANT_PROTO*)
 #ifdef I_STDLIB
 #include <stdlib.h>
 #endif
-#ifdef I_STRING
-#  include <string.h>
-#else
-#  include <strings.h>
-#endif
+#include <string.h>
 #ifdef I_MALLOC
 #  include <malloc.h>
 #endif

diff --git a/U/threads/d_nl_langinfo_l.U b/U/threads/d_nl_langinfo_l.U
index e44165b..632b46d 100644 (file)
--- a/U/threads/d_nl_langinfo_l.U
+++ b/U/threads/d_nl_langinfo_l.U
@@ -6,7 +6,7 @@
 ?RCS: License or the Artistic License, as specified in the README file.
 ?RCS:
 ?MAKE:d_thread_safe_nl_langinfo_l: Compile cat rm_try Oldconfig \
-       i_pthread i_stdlib i_string i_langinfo i_locale         \
+       i_pthread i_stdlib i_langinfo i_locale          \
        usethreads run
 ?MAKE: -pick add $@ %<
 ?S:d_thread_safe_nl_langinfo_l:
@@ -45,10 +45,7 @@ $cat >try.c <<EOCP
 #ifdef I_STDLIB
 #  include <stdlib.h>
 #endif
-#$i_string I_STRING
-#ifdef I_STRING
-#  include <string.h>
-#endif
+#include <string.h>
 #$i_langinfo I_LANGINFO
 #ifdef I_LANGINFO
 #  include <langinfo.h>

diff --git a/U/threads/d_strerror_r.U b/U/threads/d_strerror_r.U
index e932b40..07fe7d9 100644 (file)
--- a/U/threads/d_strerror_r.U
+++ b/U/threads/d_strerror_r.U
@@ -7,7 +7,7 @@
 ?RCS: Generated by the reentr.pl from the Perl 5.8 distribution.
 ?RCS:
 ?MAKE:d_strerror_r strerror_r_proto: Inlibc Protochk Hasproto i_systypes \
-       usethreads i_string extern_C
+       usethreads extern_C
 ?MAKE: -pick add $@ %<
 ?S:d_strerror_r:
 ?S:    This variable conditionally defines the HAS_STRERROR_R symbol,
@@ -39,7 +39,7 @@ set strerror_r d_strerror_r
 eval $inlibc
 case "$d_strerror_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h define stdio.h $i_string string.h"
+       hdrs="$i_systypes sys/types.h define stdio.h define string.h"
        case "$d_strerror_r_proto:$usethreads" in
        ":define")      d_strerror_r_proto=define
                set d_strerror_r_proto strerror_r $hdrs