summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xConfigure12
-rw-r--r--Cross/config.sh-arm-linux2
-rw-r--r--Cross/config.sh-arm-linux-n7702
-rw-r--r--NetWare/config.wc2
-rw-r--r--NetWare/config_H.wc12
-rw-r--r--Porting/Glossary9
-rw-r--r--Porting/config.sh2
-rw-r--r--Porting/config_H12
-rwxr-xr-xconfig_h.SH12
-rw-r--r--configure.com3
-rw-r--r--embed.fnc6
-rw-r--r--embed.h6
-rw-r--r--ext/SDBM_File/sdbm.h17
-rw-r--r--handy.h5
-rw-r--r--hints/epix.sh2
-rw-r--r--hints/svr4.sh5
-rw-r--r--hints/svr5.sh4
-rw-r--r--perl.h21
-rw-r--r--plan9/config.plan912
-rw-r--r--plan9/config_h.sample12
-rw-r--r--plan9/config_sh.sample2
-rw-r--r--proto.h10
-rw-r--r--symbian/config.sh2
-rw-r--r--uconfig.h16
-rw-r--r--uconfig.sh2
-rw-r--r--uconfig64.sh2
-rw-r--r--util.c30
-rw-r--r--win32/config.ce2
-rw-r--r--win32/config.gc2
-rw-r--r--win32/config.vc2
-rw-r--r--win32/config_H.ce12
-rw-r--r--win32/config_H.gc12
-rw-r--r--win32/config_H.vc12
33 files changed, 7 insertions, 257 deletions
diff --git a/Configure b/Configure
index 8470c377c5..0c50aec492 100755
--- a/Configure
+++ b/Configure
@@ -398,7 +398,6 @@ d_builtin_expect=''
d_builtin_add_overflow=''
d_builtin_mul_overflow=''
d_builtin_sub_overflow=''
-d_bzero=''
d_c99_variadic_macros=''
d_casti32=''
castflags=''
@@ -671,7 +670,6 @@ d_memcpy=''
d_memmem=''
d_memmove=''
d_memrchr=''
-d_memset=''
d_mkdir=''
d_mkdtemp=''
d_mkfifo=''
@@ -11686,10 +11684,6 @@ set d_builtin_expect
eval $setvar
$rm_try
-: see if bzero exists
-set bzero d_bzero
-eval $inlibc
-
: see if stdarg is available
echo " "
if $test `./findhdr stdarg.h`; then
@@ -16650,10 +16644,6 @@ eval $inlibc
set memrchr d_memrchr
eval $inlibc
-: see if memset exists
-set memset d_memset
-eval $inlibc
-
: see if mkdir exists
set mkdir d_mkdir
eval $inlibc
@@ -24701,7 +24691,6 @@ d_builtin_choose_expr='$d_builtin_choose_expr'
d_builtin_expect='$d_builtin_expect'
d_builtin_mul_overflow='$d_builtin_mul_overflow'
d_builtin_sub_overflow='$d_builtin_sub_overflow'
-d_bzero='$d_bzero'
d_c99_variadic_macros='$d_c99_variadic_macros'
d_casti32='$d_casti32'
d_castneg='$d_castneg'
@@ -24955,7 +24944,6 @@ d_memcpy='$d_memcpy'
d_memmem='$d_memmem'
d_memmove='$d_memmove'
d_memrchr='$d_memrchr'
-d_memset='$d_memset'
d_mkdir='$d_mkdir'
d_mkdtemp='$d_mkdtemp'
d_mkfifo='$d_mkfifo'
diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
index 8f7052c23e..e3e3f81141 100644
--- a/Cross/config.sh-arm-linux
+++ b/Cross/config.sh-arm-linux
@@ -135,7 +135,6 @@ d_builtin_choose_expr='define'
d_builtin_expect='define'
d_builtin_mul_overflow='undef'
d_builtin_sub_overflow='undef'
-d_bzero='define'
d_c99_variadic_macros='undef'
d_casti32='define'
d_castneg='define'
@@ -387,7 +386,6 @@ d_memcpy='define'
d_memmem='undef'
d_memmove='define'
d_memrchr='undef'
-d_memset='define'
d_mkdir='define'
d_mkdtemp='define'
d_mkfifo='define'
diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770
index 2d85400b72..c22c7f19d1 100644
--- a/Cross/config.sh-arm-linux-n770
+++ b/Cross/config.sh-arm-linux-n770
@@ -124,7 +124,6 @@ d_bsdgetpgrp='undef'
d_bsdsetpgrp='undef'
d_builtin_choose_expr='define'
d_builtin_expect='define'
-d_bzero='define'
d_c99_variadic_macros='undef'
d_casti32='define'
d_castneg='define'
@@ -300,7 +299,6 @@ d_memchr='define'
d_memcmp='define'
d_memcpy='define'
d_memmove='define'
-d_memset='define'
d_mkdir='define'
d_mkdtemp='define'
d_mkfifo='define'
diff --git a/NetWare/config.wc b/NetWare/config.wc
index ff15e1f697..714e4157ba 100644
--- a/NetWare/config.wc
+++ b/NetWare/config.wc
@@ -122,7 +122,6 @@ d_builtin_choose_expr='undef'
d_builtin_expect='undef'
d_builtin_mul_overflow='undef'
d_builtin_sub_overflow='undef'
-d_bzero='undef'
d_c99_variadic_macros='undef'
d_casti32='undef'
d_castneg='define'
@@ -376,7 +375,6 @@ d_memcpy='define'
d_memmem='undef'
d_memmove='define'
d_memrchr='undef'
-d_memset='define'
d_mkdir='define'
d_mkdtemp='undef'
d_mkfifo='undef'
diff --git a/NetWare/config_H.wc b/NetWare/config_H.wc
index 663c8d258f..1317f63861 100644
--- a/NetWare/config_H.wc
+++ b/NetWare/config_H.wc
@@ -62,12 +62,6 @@
*/
/*#define HAS_BCOPY /**/
-/* HAS_BZERO:
- * This symbol is defined if the bzero() routine is available to
- * set a memory block to 0.
- */
-/*#define HAS_BZERO /**/
-
/* HAS_CHOWN:
* This symbol, if defined, indicates that the chown routine is
* available.
@@ -315,12 +309,6 @@
*/
#define HAS_MEMMOVE /**/
-/* HAS_MEMSET:
- * This symbol, if defined, indicates that the memset routine is available
- * to set blocks of memory.
- */
-#define HAS_MEMSET /**/
-
/* HAS_MKDIR:
* This symbol, if defined, indicates that the mkdir routine is available
* to create directories. Otherwise you should fork off a new process to
diff --git a/Porting/Glossary b/Porting/Glossary
index 9c5db81bd7..07fb8a9353 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -530,10 +530,6 @@ d_builtin_expect (d_builtin.U):
__builtin_expect to provide the compiler with branch prediction
information.
-d_bzero (d_bzero.U):
- This variable conditionally defines the HAS_BZERO symbol if
- the bzero() routine is available to set memory to 0.
-
d_c99_variadic_macros (d_c99_variadic.U):
This variable conditionally defines the HAS_C99_VARIADIC_MACROS
symbol, which indicates to the C program that C99 variadic macros
@@ -1708,11 +1704,6 @@ d_memmove (d_memmove.U):
indicates to the C program that the memmove() routine is available
to copy potentially overlapping blocks of memory.
-d_memset (d_memset.U):
- This variable conditionally defines the HAS_MEMSET symbol, which
- indicates to the C program that the memset() routine is available
- to set blocks of memory.
-
d_memrchr (d_memrchr.U):
This variable conditionally defines the HAS_MEMRCHR symbol, which
indicates to the C program that the memrchr() routine is available
diff --git a/Porting/config.sh b/Porting/config.sh
index 345af9a2b8..57adaddecf 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -143,7 +143,6 @@ d_builtin_choose_expr='define'
d_builtin_expect='define'
d_builtin_mul_overflow='undef'
d_builtin_sub_overflow='undef'
-d_bzero='define'
d_c99_variadic_macros='define'
d_casti32='undef'
d_castneg='define'
@@ -397,7 +396,6 @@ d_memcpy='define'
d_memmem='define'
d_memmove='define'
d_memrchr='define'
-d_memset='define'
d_mkdir='define'
d_mkdtemp='define'
d_mkfifo='define'
diff --git a/Porting/config_H b/Porting/config_H
index 4075bb0cbe..876a58e46e 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -44,12 +44,6 @@
*/
#define HAS_BCOPY /**/
-/* HAS_BZERO:
- * This symbol is defined if the bzero() routine is available to
- * set a memory block to 0.
- */
-#define HAS_BZERO /**/
-
/* HAS_CHOWN:
* This symbol, if defined, indicates that the chown routine is
* available.
@@ -287,12 +281,6 @@
*/
#define HAS_MEMRCHR /**/
-/* HAS_MEMSET:
- * This symbol, if defined, indicates that the memset routine is available
- * to set blocks of memory.
- */
-#define HAS_MEMSET /**/
-
/* HAS_MKDIR:
* This symbol, if defined, indicates that the mkdir routine is available
* to create directories. Otherwise you should fork off a new process to
diff --git a/config_h.SH b/config_h.SH
index d9d5983b3a..8c86772c24 100755
--- a/config_h.SH
+++ b/config_h.SH
@@ -75,12 +75,6 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
*/
#$d_bcopy HAS_BCOPY /**/
-/* HAS_BZERO:
- * This symbol is defined if the bzero() routine is available to
- * set a memory block to 0.
- */
-#$d_bzero HAS_BZERO /**/
-
/* HAS_CBRT:
* This symbol, if defined, indicates that the cbrt() (cube root)
* function is available.
@@ -317,12 +311,6 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
*/
#$d_memmove HAS_MEMMOVE /**/
-/* HAS_MEMSET:
- * This symbol, if defined, indicates that the memset routine is available
- * to set blocks of memory.
- */
-#$d_memset HAS_MEMSET /**/
-
/* HAS_MKDIR:
* This symbol, if defined, indicates that the mkdir routine is available
* to create directories. Otherwise you should fork off a new process to
diff --git a/configure.com b/configure.com
index e0f7638477..c540a7a8df 100644
--- a/configure.com
+++ b/configure.com
@@ -4418,7 +4418,6 @@ $ WS "}"
$ CS
$ tmp = "bzero"
$ GOSUB inlibc
-$ d_bzero = tmp
$!
$! Check for bcopy
$!
@@ -5997,7 +5996,6 @@ $ WC "d_builtin_expect='undef'" ! GCC only
$ WC "d_builtin_add_overflow='undef'" ! GCC only
$ WC "d_builtin_mul_overflow='undef'" ! GCC only
$ WC "d_builtin_sub_overflow='undef'" ! GCC only
-$ WC "d_bzero='" + d_bzero + "'"
$ WC "d_casti32='define'"
$ WC "d_castneg='define'"
$ WC "d_cbrt='" + d_cbrt + "'"
@@ -6224,7 +6222,6 @@ $ WC "d_memcpy='define'"
$ WC "d_memmem='undef'"
$ WC "d_memmove='define'"
$ WC "d_memrchr='" + d_memrchr + "'"
-$ WC "d_memset='define'"
$ WC "d_mkdir='define'"
$ WC "d_mkdtemp='" + d_mkdtemp + "'"
$ WC "d_mkfifo='undef'"
diff --git a/embed.fnc b/embed.fnc
index bcef22ad2e..279f1cb6f2 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -1058,9 +1058,6 @@ Ap |NV |my_atof |NN const char *s
#if !defined(HAS_MEMCPY) || (!defined(HAS_MEMMOVE) && !defined(HAS_SAFE_MEMCPY))
Anp |void* |my_bcopy |NN const void* vfrom|NN void* vto|size_t len
#endif
-#if !defined(HAS_BZERO) && !defined(HAS_MEMSET)
-Anp |void* |my_bzero |NN void* vloc|size_t len
-#endif
Apr |void |my_exit |U32 status
Apr |void |my_failure_exit
Ap |I32 |my_fflush_all
@@ -1072,9 +1069,6 @@ pX |I32 |my_lstat_flags |NULLOK const U32 flags
#if !defined(HAS_MEMCMP) || !defined(HAS_SANE_MEMCMP)
AnpP |int |my_memcmp |NN const void* vs1|NN const void* vs2|size_t len
#endif
-#if !defined(HAS_MEMSET)
-Anp |void* |my_memset |NN void* vloc|int ch|size_t len
-#endif
#if !defined(PERL_IMPLICIT_SYS)
Ap |I32 |my_pclose |NULLOK PerlIO* ptr
Ap |PerlIO*|my_popen |NN const char* cmd|NN const char* mode
diff --git a/embed.h b/embed.h
index 0f491afd77..5273668a71 100644
--- a/embed.h
+++ b/embed.h
@@ -779,18 +779,12 @@
#if !(defined(HAS_SIGACTION) && defined(SA_SIGINFO))
#define csighandler Perl_csighandler
#endif
-#if !defined(HAS_BZERO) && !defined(HAS_MEMSET)
-#define my_bzero Perl_my_bzero
-#endif
#if !defined(HAS_MEMCMP) || !defined(HAS_SANE_MEMCMP)
#define my_memcmp Perl_my_memcmp
#endif
#if !defined(HAS_MEMCPY) || (!defined(HAS_MEMMOVE) && !defined(HAS_SAFE_MEMCPY))
#define my_bcopy Perl_my_bcopy
#endif
-#if !defined(HAS_MEMSET)
-#define my_memset Perl_my_memset
-#endif
#if !defined(HAS_TRUNCATE) && !defined(HAS_CHSIZE) && defined(F_FREESP)
#define my_chsize(a,b) Perl_my_chsize(aTHX_ a,b)
#endif
diff --git a/ext/SDBM_File/sdbm.h b/ext/SDBM_File/sdbm.h
index 8d9cffd479..f32a00698e 100644
--- a/ext/SDBM_File/sdbm.h
+++ b/ext/SDBM_File/sdbm.h
@@ -222,22 +222,7 @@ Free_t Perl_mfree proto((Malloc_t where));
# endif
#endif /* HAS_MEMCPY */
-#ifdef HAS_MEMSET
-# if !defined(STANDARD_C) && !defined(I_STRING) && !defined(I_MEMORY)
-# ifndef memset
- extern char *memset proto((char*, int, int));
-# endif
-# endif
-# define memzero(d,l) memset(d,0,l)
-#else
-# ifndef memzero
-# ifdef HAS_BZERO
-# define memzero(d,l) bzero(d,l)
-# else
-# define memzero(d,l) my_bzero(d,l)
-# endif
-# endif
-#endif /* HAS_MEMSET */
+#define memzero(d,l) memset(d,0,l)
#if defined(mips) && defined(ultrix) && !defined(__STDC__)
# undef HAS_MEMCMP
diff --git a/handy.h b/handy.h
index 8e18d78532..0f31e57218 100644
--- a/handy.h
+++ b/handy.h
@@ -2418,12 +2418,7 @@ void Perl_mem_log_del_sv(const SV *sv, const char *filename, const int linenumbe
#define MoveD(s,d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), memmove((char*)(d),(const char*)(s), (n) * sizeof(t)))
#define CopyD(s,d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), memcpy((char*)(d),(const char*)(s), (n) * sizeof(t)))
-#ifdef HAS_MEMSET
#define ZeroD(d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), memzero((char*)(d), (n) * sizeof(t)))
-#else
-/* Using bzero(), which returns void. */
-#define ZeroD(d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), memzero((char*)(d), (n) * sizeof(t)),d)
-#endif
#define PoisonWith(d,n,t,b) (MEM_WRAP_CHECK_(n,t) (void)memset((char*)(d), (U8)(b), (n) * sizeof(t)))
#define PoisonNew(d,n,t) PoisonWith(d,n,t,0xAB)
diff --git a/hints/epix.sh b/hints/epix.sh
index 14326b544f..1b87e99890 100644
--- a/hints/epix.sh
+++ b/hints/epix.sh
@@ -55,7 +55,7 @@ libswanted=`echo " $libswanted " | sed -e 's/ malloc / /'` # -e 's/ ucb / /'`
# it is needed for ODBM_File and NDBM_File extensions.
if [ -r /usr/ucblib/libucb.a ]; then # If using BSD-compat. library:
# Use the "native" counterparts, not the BSD emulation stuff:
- d_bcmp='undef'; d_bcopy='undef'; d_bzero='undef'; d_safebcpy='undef'
+ d_bcmp='undef'; d_bcopy='undef'; d_safebcpy='undef'
d_index='undef'; d_killpg='undef'; d_getprior='undef'; d_setprior='undef'
d_setlinebuf='undef'; d_setregid='undef'; d_setreuid='undef'
fi
diff --git a/hints/svr4.sh b/hints/svr4.sh
index 34a00ab3f2..81b0740f6e 100644
--- a/hints/svr4.sh
+++ b/hints/svr4.sh
@@ -25,7 +25,7 @@ libswanted=`echo " $libswanted " | sed -e 's/ malloc / /'` # -e 's/ ucb / /'`
if [ -r /usr/ucblib/libucb.a ]; then # If using BSD-compat. library:
gconvert_preference='gcvt sprintf' # Try gcvt() before gconvert().
# Use the "native" counterparts, not the BSD emulation stuff:
- d_bcmp='undef' d_bcopy='undef' d_bzero='undef' d_safebcpy='undef'
+ d_bcmp='undef' d_bcopy='undef' d_safebcpy='undef'
d_index='undef' d_killpg='undef' d_getprior='undef' d_setprior='undef'
d_setlinebuf='undef'
# d_setregid='undef' d_setreuid='undef' # ???
@@ -90,12 +90,10 @@ if [ "$uw_isuw" = "Release = 4.2MP" ]; then
2.1)
d_csh='undef'
d_memcpy='define'
- d_memset='define'
;;
2.1.*)
d_csh='undef'
d_memcpy='define'
- d_memset='define'
stdio_cnt='((fp)->__cnt)'
d_stdio_cnt_lval='define'
stdio_ptr='((fp)->__ptr)'
@@ -108,7 +106,6 @@ if [ "$uw_isuw" = "Release = 5" ]; then
7)
d_csh='undef'
d_memcpy='define'
- d_memset='define'
stdio_cnt='((fp)->__cnt)'
d_stdio_cnt_lval='define'
stdio_ptr='((fp)->__ptr)'
diff --git a/hints/svr5.sh b/hints/svr5.sh
index e0b5b619b6..804db9a670 100644
--- a/hints/svr5.sh
+++ b/hints/svr5.sh
@@ -92,7 +92,7 @@ glibpth=`echo " $glibpth " | sed -e 's/ \/shlib / /' -e 's/ \/lib / /'`
# Don't use BSD emulation pieces (/usr/ucblib) regardless
# these would probably be autonondetected anyway but ...
gconvert_preference='gcvt sprintf' # Try gcvt() before gconvert().
-d_bcopy='undef' d_bcmp='undef' d_bzero='undef' d_safebcpy='undef'
+d_bcopy='undef' d_bcmp='undef' d_safebcpy='undef'
d_index='undef' d_killpg='undef' d_getprior='undef' d_setprior='undef'
d_setlinebuf='undef'
d_setregid='undef' d_setreuid='undef' # -- in /usr/lib/libc.so.1
@@ -121,7 +121,6 @@ if [ "$uw_isuw" = "UnixWare" -o "$uw_isuw" = "OpenUNIX" ]; then
8.*|7.1*)
d_csh='undef'
d_memcpy='define'
- d_memset='define'
stdio_cnt='((fp)->__cnt)'
d_stdio_cnt_lval='define'
stdio_ptr='((fp)->__ptr)'
@@ -138,7 +137,6 @@ if [ "$uw_isuw" = "UnixWare" -o "$uw_isuw" = "OpenUNIX" ]; then
7*)
d_csh='undef'
d_memcpy='define'
- d_memset='define'
stdio_cnt='((fp)->__cnt)'
d_stdio_cnt_lval='define'
stdio_ptr='((fp)->__ptr)'
diff --git a/perl.h b/perl.h
index 315dffb3ff..40a60949f2 100644
--- a/perl.h
+++ b/perl.h
@@ -1013,17 +1013,6 @@ EXTERN_C int usleep(unsigned int);
# endif
#endif /* HAS_MEMCPY */
-#ifdef HAS_MEMSET
-# if !defined(STANDARD_C) && !defined(I_STRING) && !defined(I_MEMORY)
-# ifndef memset
- extern char *memset (char*, int, int);
-# endif
-# endif
-#else
-# undef memset
-# define memset(d,c,l) my_memset(d,c,l)
-#endif /* HAS_MEMSET */
-
#if !defined(HAS_MEMMOVE) && !defined(memmove)
# if defined(HAS_MEMCPY) && defined(HAS_SAFE_MEMCPY)
# define memmove(d,s,l) memcpy(d,s,l)
@@ -1048,15 +1037,7 @@ EXTERN_C int usleep(unsigned int);
#endif /* HAS_MEMCMP && HAS_SANE_MEMCMP */
#ifndef memzero
-# ifdef HAS_MEMSET
-# define memzero(d,l) memset(d,0,l)
-# else
-# ifdef HAS_BZERO
-# define memzero(d,l) bzero(d,l)
-# else
-# define memzero(d,l) my_bzero(d,l)
-# endif
-# endif
+# define memzero(d,l) memset(d,0,l)
#endif
#ifndef PERL_MICRO
diff --git a/plan9/config.plan9 b/plan9/config.plan9
index b32fa84335..ec471db45d 100644
--- a/plan9/config.plan9
+++ b/plan9/config.plan9
@@ -104,12 +104,6 @@
*/
#define HAS_BCOPY /**/
-/* HAS_BZERO:
- * This symbol is defined if the bzero() routine is available to
- * set a memory block to 0.
- */
-#define HAS_BZERO /**/
-
/* HAS_CHOWN:
* This symbol, if defined, indicates that the chown routine is
* available.
@@ -339,12 +333,6 @@
*/
#define HAS_MEMMOVE /**/
-/* HAS_MEMSET:
- * This symbol, if defined, indicates that the memset routine is available
- * to set blocks of memory.
- */
-#define HAS_MEMSET /**/
-
/* HAS_MKDIR:
* This symbol, if defined, indicates that the mkdir routine is available
* to create directories. Otherwise you should fork off a new process to
diff --git a/plan9/config_h.sample b/plan9/config_h.sample
index d7342cfc23..5baf0540b2 100644
--- a/plan9/config_h.sample
+++ b/plan9/config_h.sample
@@ -62,12 +62,6 @@
*/
#define HAS_BCOPY /**/
-/* HAS_BZERO:
- * This symbol is defined if the bzero() routine is available to
- * set a memory block to 0.
- */
-#define HAS_BZERO /**/
-
/* HAS_CHOWN:
* This symbol, if defined, indicates that the chown routine is
* available.
@@ -297,12 +291,6 @@
*/
#define HAS_MEMMOVE /**/
-/* HAS_MEMSET:
- * This symbol, if defined, indicates that the memset routine is available
- * to set blocks of memory.
- */
-#define HAS_MEMSET /**/
-
/* HAS_MKDIR:
* This symbol, if defined, indicates that the mkdir routine is available
* to create directories. Otherwise you should fork off a new process to
diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample
index 003dfc95b6..ecf02feedb 100644
--- a/plan9/config_sh.sample
+++ b/plan9/config_sh.sample
@@ -135,7 +135,6 @@ d_builtin_choose_expr='undef'
d_builtin_expect='undef'
d_builtin_mul_overflow='undef'
d_builtin_sub_overflow='undef'
-d_bzero='define'
d_c99_variadic_macros='undef'
d_casti32='undef'
d_castneg='undef'
@@ -387,7 +386,6 @@ d_memcpy='define'
d_memmem='undef'
d_memmove='define'
d_memrchr='undef'
-d_memset='define'
d_mkdir='define'
d_mkdtemp='undef'
d_mkfifo='define'
diff --git a/proto.h b/proto.h
index b02c677f32..b004723069 100644
--- a/proto.h
+++ b/proto.h
@@ -3822,11 +3822,6 @@ PERL_CALLCONV_NO_RET int Perl_magic_regdatum_set(pTHX_ SV* sv, MAGIC* mg)
assert(sv); assert(mg)
#endif
-#if !defined(HAS_BZERO) && !defined(HAS_MEMSET)
-PERL_CALLCONV void* Perl_my_bzero(void* vloc, size_t len);
-#define PERL_ARGS_ASSERT_MY_BZERO \
- assert(vloc)
-#endif
#if !defined(HAS_GETENV_LEN)
PERL_CALLCONV char* Perl_getenv_len(pTHX_ const char *env_elem, unsigned long *len);
#define PERL_ARGS_ASSERT_GETENV_LEN \
@@ -3845,11 +3840,6 @@ PERL_CALLCONV void* Perl_my_bcopy(const void* vfrom, void* vto, size_t len);
#define PERL_ARGS_ASSERT_MY_BCOPY \
assert(vfrom); assert(vto)
#endif
-#if !defined(HAS_MEMSET)
-PERL_CALLCONV void* Perl_my_memset(void* vloc, int ch, size_t len);
-#define PERL_ARGS_ASSERT_MY_MEMSET \
- assert(vloc)
-#endif
#if !defined(HAS_MKDIR) || !defined(HAS_RMDIR)
# if defined(PERL_IN_PP_SYS_C)
STATIC int S_dooneliner(pTHX_ const char *cmd, const char *filename)
diff --git a/symbian/config.sh b/symbian/config.sh
index a670160f41..f798c1a36a 100644
--- a/symbian/config.sh
+++ b/symbian/config.sh
@@ -79,7 +79,6 @@ d_builtin_choose_expr='undef'
d_builtin_expect='undef'
d_builtin_mul_overflow='undef'
d_builtin_sub_overflow='undef'
-d_bzero='undef'
d_c99_variadic_macros='undef'
d_casti32='undef'
d_castneg='undef'
@@ -333,7 +332,6 @@ d_memcpy='define'
d_memmem='undef'
d_memmove='define'
d_memrchr='undef'
-d_memset='define'
d_mkdir='define'
d_mkdtemp='undef'
d_mkfifo='undef'
diff --git a/uconfig.h b/uconfig.h
index 83fa8d8e7a..d4341e4116 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -40,12 +40,6 @@
*/
/*#define HAS_BCOPY / **/
-/* HAS_BZERO:
- * This symbol is defined if the bzero() routine is available to
- * set a memory block to 0.
- */
-/*#define HAS_BZERO / **/
-
/* HAS_CBRT:
* This symbol, if defined, indicates that the cbrt() (cube root)
* function is available.
@@ -282,12 +276,6 @@
*/
/*#define HAS_MEMMOVE / **/
-/* HAS_MEMSET:
- * This symbol, if defined, indicates that the memset routine is available
- * to set blocks of memory.
- */
-#define HAS_MEMSET /**/
-
/* HAS_MKDIR:
* This symbol, if defined, indicates that the mkdir routine is available
* to create directories. Otherwise you should fork off a new process to
@@ -5439,6 +5427,6 @@
#endif
/* Generated from:
- * 292f88691798392c51314921d1a53aca1044ccfd5410c0338c659f8ec2a6eab5 config_h.SH
- * 2cd0f319cf0414d19be815afda24bae1eb0bde6e3d6f3bb2ca79bc4775549ac2 uconfig.sh
+ * 7ff89cdb1fe8ce0204ce7e895ef3799d115d4e499f4b93f639ab96b64a63d57e config_h.SH
+ * bd4d12ab7495a044625abc3e1128f6939bdb50a02a59ae3a1b8bf64433002191 uconfig.sh
* ex: set ro: */
diff --git a/uconfig.sh b/uconfig.sh
index 2fe61e1e8a..ae319aa7c3 100644
--- a/uconfig.sh
+++ b/uconfig.sh
@@ -73,7 +73,6 @@ d_builtin_choose_expr='undef'
d_builtin_expect='undef'
d_builtin_mul_overflow='undef'
d_builtin_sub_overflow='undef'
-d_bzero='undef'
d_c99_variadic_macros='undef'
d_casti32='undef'
d_castneg='undef'
@@ -326,7 +325,6 @@ d_memcpy='define'
d_memmem='undef'
d_memmove='undef'
d_memrchr='undef'
-d_memset='define'
d_mkdir='undef'
d_mkdtemp='undef'
d_mkfifo='undef'
diff --git a/uconfig64.sh b/uconfig64.sh
index 670306f22f..e044c81e04 100644
--- a/uconfig64.sh
+++ b/uconfig64.sh
@@ -74,7 +74,6 @@ d_builtin_choose_expr='undef'
d_builtin_expect='undef'
d_builtin_mul_overflow='undef'
d_builtin_sub_overflow='undef'
-d_bzero='undef'
d_c99_variadic_macros='undef'
d_casti32='undef'
d_castneg='undef'
@@ -327,7 +326,6 @@ d_memcpy='define'
d_memmem='undef'
d_memmove='undef'
d_memrchr='undef'
-d_memset='define'
d_mkdir='undef'
d_mkdtemp='undef'
d_mkfifo='undef'
diff --git a/util.c b/util.c
index d93e4837ab..d2659b4fbc 100644
--- a/util.c
+++ b/util.c
@@ -2253,36 +2253,6 @@ Perl_my_bcopy(const void *vfrom, void *vto, size_t len)
}
#endif
-/* this is a drop-in replacement for memset() */
-#ifndef HAS_MEMSET
-void *
-Perl_my_memset(void *vloc, int ch, size_t len)
-{
- unsigned char *loc = (unsigned char *)vloc;
-
- PERL_ARGS_ASSERT_MY_MEMSET;
-
- while (len--)
- *loc++ = ch;
- return vloc;
-}
-#endif
-
-/* this is a drop-in replacement for bzero() */
-#if !defined(HAS_BZERO) && !defined(HAS_MEMSET)
-void *
-Perl_my_bzero(void *vloc, size_t len)
-{
- unsigned char *loc = (unsigned char *)vloc;
-
- PERL_ARGS_ASSERT_MY_BZERO;
-
- while (len--)
- *loc++ = 0;
- return vloc;
-}
-#endif
-
/* this is a drop-in replacement for memcmp() */
#if !defined(HAS_MEMCMP) || !defined(HAS_SANE_MEMCMP)
int
diff --git a/win32/config.ce b/win32/config.ce
index 5200ce6655..6b26210619 100644
--- a/win32/config.ce
+++ b/win32/config.ce
@@ -120,7 +120,6 @@ d_builtin_choose_expr='undef'
d_builtin_expect='undef'
d_builtin_mul_overflow='undef'
d_builtin_sub_overflow='undef'
-d_bzero='undef'
d_c99_variadic_macros='undef'
d_casti32='undef'
d_castneg='define'
@@ -374,7 +373,6 @@ d_memcpy='define'
d_memmem='undef'
d_memmove='define'
d_memrchr='undef'
-d_memset='define'
d_mkdir='define'
d_mkdtemp='undef'
d_mkfifo='undef'
diff --git a/win32/config.gc b/win32/config.gc
index f01b0ae3a8..8863d11943 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -122,7 +122,6 @@ d_builtin_choose_expr='undef'
d_builtin_expect='undef'
d_builtin_mul_overflow='undef'
d_builtin_sub_overflow='undef'
-d_bzero='undef'
d_c99_variadic_macros='undef'
d_casti32='define'
d_castneg='define'
@@ -374,7 +373,6 @@ d_memcpy='define'
d_memmem='undef'
d_memmove='define'
d_memrchr='undef'
-d_memset='define'
d_mkdir='define'
d_mkdtemp='undef'
d_mkfifo='undef'
diff --git a/win32/config.vc b/win32/config.vc
index 394caa0704..e73cfbe66d 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -122,7 +122,6 @@ d_builtin_choose_expr='undef'
d_builtin_expect='undef'
d_builtin_mul_overflow='undef'
d_builtin_sub_overflow='undef'
-d_bzero='undef'
d_c99_variadic_macros='undef'
d_casti32='undef'
d_castneg='define'
@@ -374,7 +373,6 @@ d_memcpy='define'
d_memmem='undef'
d_memmove='define'
d_memrchr='undef'
-d_memset='define'
d_mkdir='define'
d_mkdtemp='undef'
d_mkfifo='undef'
diff --git a/win32/config_H.ce b/win32/config_H.ce
index 40d6f9290b..9ee004ca99 100644
--- a/win32/config_H.ce
+++ b/win32/config_H.ce
@@ -44,12 +44,6 @@
*/
/*#define HAS_BCOPY /**/
-/* HAS_BZERO:
- * This symbol is defined if the bzero() routine is available to
- * set a memory block to 0.
- */
-/*#define HAS_BZERO /**/
-
/* HAS_CHOWN:
* This symbol, if defined, indicates that the chown routine is
* available.
@@ -279,12 +273,6 @@
*/
#define HAS_MEMMOVE /**/
-/* HAS_MEMSET:
- * This symbol, if defined, indicates that the memset routine is available
- * to set blocks of memory.
- */
-#define HAS_MEMSET /**/
-
/* HAS_MKDIR:
* This symbol, if defined, indicates that the mkdir routine is available
* to create directories. Otherwise you should fork off a new process to
diff --git a/win32/config_H.gc b/win32/config_H.gc
index 9fe3e369a6..08b719c338 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -40,12 +40,6 @@
*/
/*#define HAS_BCOPY / **/
-/* HAS_BZERO:
- * This symbol is defined if the bzero() routine is available to
- * set a memory block to 0.
- */
-/*#define HAS_BZERO / **/
-
/* HAS_CBRT:
* This symbol, if defined, indicates that the cbrt() (cube root)
* function is available.
@@ -282,12 +276,6 @@
*/
#define HAS_MEMMOVE /**/
-/* HAS_MEMSET:
- * This symbol, if defined, indicates that the memset routine is available
- * to set blocks of memory.
- */
-#define HAS_MEMSET /**/
-
/* HAS_MKDIR:
* This symbol, if defined, indicates that the mkdir routine is available
* to create directories. Otherwise you should fork off a new process to
diff --git a/win32/config_H.vc b/win32/config_H.vc
index c105905e9a..a8f1f11063 100644
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -40,12 +40,6 @@
*/
/*#define HAS_BCOPY / **/
-/* HAS_BZERO:
- * This symbol is defined if the bzero() routine is available to
- * set a memory block to 0.
- */
-/*#define HAS_BZERO / **/
-
/* HAS_CBRT:
* This symbol, if defined, indicates that the cbrt() (cube root)
* function is available.
@@ -282,12 +276,6 @@
*/
#define HAS_MEMMOVE /**/
-/* HAS_MEMSET:
- * This symbol, if defined, indicates that the memset routine is available
- * to set blocks of memory.
- */
-#define HAS_MEMSET /**/
-
/* HAS_MKDIR:
* This symbol, if defined, indicates that the mkdir routine is available
* to create directories. Otherwise you should fork off a new process to