Don't attempt to use non-standard <memory.h>

It's only needed on systems without C89 <string.h>, which we rely on anyway.

25 files changed, 2 insertions, 106 deletions

diff --git a/Configure b/Configure
index 14495ed219..4a522328d0 100755
--- a/Configure
+++ b/Configure
@@ -991,7 +991,6 @@ i_locale=''
 i_machcthr=''
 i_malloc=''
 i_mallocmalloc=''
-i_memory=''
 i_mntent=''
 d_gdbm_ndbm_h_uses_prototypes=''
 d_gdbmndbm_h_uses_prototypes=''
@@ -22659,30 +22658,6 @@ else
 	i_machcthr="$undef"
 fi
 
-: see if memory.h is available.
-val=''
-set memory.h val
-eval $inhdr
-
-: See if it conflicts with string.h
-case "$val" in
-$define)
-	case "$strings" in
-	'') ;;
-	*)
-		$cppstdin $cppflags $cppminus < $strings > mem.h
-		if $contains 'memcpy' mem.h >/dev/null 2>&1; then
-			echo " "
-			echo "We won't be including <memory.h>."
-			val="$undef"
-		fi
-		$rm -f mem.h
-		;;
-	esac
-esac
-set i_memory
-eval $setvar
-
 : see if this is a mntent.h system
 set mntent.h i_mntent
 eval $inhdr
@@ -24428,7 +24403,6 @@ i_locale='$i_locale'
 i_machcthr='$i_machcthr'
 i_malloc='$i_malloc'
 i_mallocmalloc='$i_mallocmalloc'
-i_memory='$i_memory'
 i_mntent='$i_mntent'
 i_ndbm='$i_ndbm'
 i_netdb='$i_netdb'
diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
index feaeb8aac3..33083bc13f 100644
--- a/Cross/config.sh-arm-linux
+++ b/Cross/config.sh-arm-linux
@@ -749,7 +749,6 @@ i_locale='define'
 i_machcthr='undef'
 i_malloc='define'
 i_mallocmalloc='undef'
-i_memory='undef'
 i_mntent='define'
 i_ndbm='undef'
 i_netdb='define'
diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770
index d0befdad9a..a7f3849771 100644
--- a/Cross/config.sh-arm-linux-n770
+++ b/Cross/config.sh-arm-linux-n770
@@ -610,7 +610,6 @@ i_locale='define'
 i_machcthr='undef'
 i_malloc='define'
 i_mallocmalloc='undef'
-i_memory='undef'
 i_mntent='define'
 i_ndbm='undef'
 i_netdb='define'
diff --git a/NetWare/config.wc b/NetWare/config.wc
index d98ed362b2..660dd9c564 100644
--- a/NetWare/config.wc
+++ b/NetWare/config.wc
@@ -731,7 +731,6 @@ i_locale='define'
 i_machcthr='undef'
 i_malloc='define'
 i_mallocmalloc='undef'
-i_memory='undef'
 i_mntent='undef'
 i_ndbm='undef'
 i_netdb='define'
diff --git a/NetWare/config_H.wc b/NetWare/config_H.wc
index 37b1d2689e..a369f6e854 100644
--- a/NetWare/config_H.wc
+++ b/NetWare/config_H.wc
@@ -654,12 +654,6 @@
  */
 #define	I_LOCALE		/**/
 
-/* I_MEMORY:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <memory.h>.
- */
-/*#define I_MEMORY		/**/
-
 /* I_NDBM:
  *	This symbol, if defined, indicates that <ndbm.h> exists and should
  *	be included.
diff --git a/Porting/Glossary b/Porting/Glossary
index f6d72c5be3..03156f0ddf 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -3489,10 +3489,6 @@ i_mallocmalloc (i_mallocmalloc.U):
 	This variable conditionally defines the I_MALLOCMALLOC symbol,
 	and indicates whether a C program should include <malloc/malloc.h>.
 
-i_memory (i_memory.U):
-	This variable conditionally defines the I_MEMORY symbol, and indicates
-	whether a C program should include <memory.h>.
-
 i_mntent (i_mntent.U):
 	This variable conditionally defines the I_MNTENT symbol, and indicates
 	whether a C program should include <mntent.h>.
diff --git a/Porting/config.sh b/Porting/config.sh
index 9a4e0695a4..1cc8d53612 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -767,7 +767,6 @@ i_locale='define'
 i_machcthr='undef'
 i_malloc='undef'
 i_mallocmalloc='define'
-i_memory='undef'
 i_mntent='undef'
 i_ndbm='define'
 i_netdb='define'
diff --git a/Porting/config_H b/Porting/config_H
index b56dd606a9..8749ceeaf1 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -618,12 +618,6 @@
  */
 #define	I_LOCALE		/**/
 
-/* I_MEMORY:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <memory.h>.
- */
-/*#define I_MEMORY		/ **/
-
 /* I_NETINET_IN:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <netinet/in.h>. Otherwise, you may try <sys/in.h>.
diff --git a/config_h.SH b/config_h.SH
index ce046ed9e0..00f2458bde 100755
--- a/config_h.SH
+++ b/config_h.SH
@@ -673,12 +673,6 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #$i_locale	I_LOCALE		/**/
 
-/* I_MEMORY:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <memory.h>.
- */
-#$i_memory I_MEMORY		/**/
-
 /* I_NETINET_IN:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <netinet/in.h>. Otherwise, you may try <sys/in.h>.
diff --git a/configure.com b/configure.com
index 8b1106f0b0..5f354aae4a 100644
--- a/configure.com
+++ b/configure.com
@@ -6556,7 +6556,6 @@ $ WC "i_machcthr='undef'"
 $ WC "i_machcthreads='undef'"
 $ WC "i_malloc='undef'"
 $ WC "i_mallocmalloc='undef'"
-$ WC "i_memory='undef'"
 $ WC "i_mntent='undef'"
 $ WC "i_ndbm='undef'"
 $ WC "i_netdb='" + i_netdb + "'"
diff --git a/ext/SDBM_File/sdbm.h b/ext/SDBM_File/sdbm.h
index ba001cfbed..085aaceb2d 100644
--- a/ext/SDBM_File/sdbm.h
+++ b/ext/SDBM_File/sdbm.h
@@ -186,10 +186,6 @@ Free_t   Perl_mfree(Malloc_t where);
 # include <strings.h>
 #endif
 
-#ifdef I_MEMORY
-#include <memory.h>
-#endif      
-
 #define memzero(d,l) memset(d,0,l)
 
 #ifdef BUGGY_MSC
diff --git a/perl.h b/perl.h
index 2b4c324514..4072bd2771 100644
--- a/perl.h
+++ b/perl.h
@@ -959,10 +959,6 @@ EXTERN_C int usleep(unsigned int);
 #define MALLOC_TOO_LATE_FOR(ch)	TOO_LATE_FOR_(ch, " with $ENV{PERL_MALLOC_OPT}")
 #define MALLOC_CHECK_TAINT2(argc,argv)	MALLOC_CHECK_TAINT(argc,argv,NULL)
 
-#ifdef I_MEMORY
-#  include <memory.h>
-#endif
-
 #ifndef memzero
 #   define memzero(d,l) memset(d,0,l)
 #endif
diff --git a/plan9/config.plan9 b/plan9/config.plan9
index b75842f053..101ad92165 100644
--- a/plan9/config.plan9
+++ b/plan9/config.plan9
@@ -664,12 +664,6 @@
  */
 #define	I_LOCALE		/**/
 
-/* I_MEMORY:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <memory.h>.
- */
-/*#define I_MEMORY		/ **/
-
 /* I_NET_ERRNO:
  *	This symbol, if defined, indicates that <net/errno.h> exists and 
  *	should be included.
diff --git a/plan9/config_h.sample b/plan9/config_h.sample
index 2e0b7647a2..2a31593eb0 100644
--- a/plan9/config_h.sample
+++ b/plan9/config_h.sample
@@ -622,12 +622,6 @@
  */
 #define	I_LOCALE		/**/
 
-/* I_MEMORY:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <memory.h>.
- */
-/*#define I_MEMORY		/ **/
-
 /* I_NET_ERRNO:
  *	This symbol, if defined, indicates that <net/errno.h> exists and 
  *	should be included.
diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample
index 538e397a26..26d86663eb 100644
--- a/plan9/config_sh.sample
+++ b/plan9/config_sh.sample
@@ -743,7 +743,6 @@ i_locale='define'
 i_machcthr='undef'
 i_malloc='undef'
 i_mallocmalloc='undef'
-i_memory='undef'
 i_mntent='undef'
 i_ndbm='undef'
 i_netdb='define'
diff --git a/symbian/config.sh b/symbian/config.sh
index eb5b16fd3a..e5fd1e3e3e 100644
--- a/symbian/config.sh
+++ b/symbian/config.sh
@@ -671,7 +671,6 @@ i_locale='define'
 i_machcthr='undef'
 i_malloc='undef'
 i_mallocmalloc='undef'
-i_memory='undef'
 i_mntent='undef'
 i_ndbm='undef'
 i_netdb='define'
diff --git a/uconfig.h b/uconfig.h
index b028c9783b..77187c97cc 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -638,12 +638,6 @@
  */
 /*#define	I_LOCALE		/ **/
 
-/* I_MEMORY:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <memory.h>.
- */
-/*#define I_MEMORY		/ **/
-
 /* I_NETINET_IN:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <netinet/in.h>. Otherwise, you may try <sys/in.h>.
@@ -5195,6 +5189,6 @@
 #endif
 
 /* Generated from:
- * 19dc934d2543aae24f9cd7a20aa97f4f6fa9a3680e4cb3c24d5c9920f0f8fd31 config_h.SH
- * fa19c21ba6517cbd4de934e966302bd2e3b9c12a3f0b293f005feb16eb5fc8f6 uconfig.sh
+ * 7d20869bdf5823fce14e1728a7c415917f7e1fcddf5df6f6b4b16a1a9e2cc6cb config_h.SH
+ * 0840ae8893cc31a34607870782c78181109e94dfaedff874545a5b2227501892 uconfig.sh
  * ex: set ro: */
diff --git a/uconfig.sh b/uconfig.sh
index a591e8f2d0..d23dfabf16 100644
--- a/uconfig.sh
+++ b/uconfig.sh
@@ -657,7 +657,6 @@ i_locale='undef'
 i_machcthr='undef'
 i_malloc='undef'
 i_mallocmalloc='undef'
-i_memory='undef'
 i_mntent='undef'
 i_ndbm='undef'
 i_netdb='undef'
diff --git a/uconfig64.sh b/uconfig64.sh
index bfa014004f..60c49b17fb 100644
--- a/uconfig64.sh
+++ b/uconfig64.sh
@@ -657,7 +657,6 @@ i_locale='undef'
 i_machcthr='undef'
 i_malloc='undef'
 i_mallocmalloc='undef'
-i_memory='undef'
 i_mntent='undef'
 i_ndbm='undef'
 i_netdb='undef'
diff --git a/win32/config.ce b/win32/config.ce
index d7d950253a..734969185d 100644
--- a/win32/config.ce
+++ b/win32/config.ce
@@ -727,7 +727,6 @@ i_locale='define'
 i_machcthr='undef'
 i_malloc='define'
 i_mallocmalloc='undef'
-i_memory='undef'
 i_mntent='undef'
 i_ndbm='undef'
 i_netdb='undef'
diff --git a/win32/config.gc b/win32/config.gc
index 02c9e3bf09..5baf5fe8a4 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -741,7 +741,6 @@ i_locale='define'
 i_machcthr='undef'
 i_malloc='define'
 i_mallocmalloc='undef'
-i_memory='undef'
 i_mntent='undef'
 i_ndbm='undef'
 i_netdb='undef'
diff --git a/win32/config.vc b/win32/config.vc
index 1dd71ace91..ef7f652ce9 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -738,7 +738,6 @@ i_locale='define'
 i_machcthr='undef'
 i_malloc='define'
 i_mallocmalloc='undef'
-i_memory='undef'
 i_mntent='undef'
 i_ndbm='undef'
 i_netdb='undef'
diff --git a/win32/config_H.ce b/win32/config_H.ce
index 26f0cb8a62..f4a1e12871 100644
--- a/win32/config_H.ce
+++ b/win32/config_H.ce
@@ -604,12 +604,6 @@
  */
 /*#define	I_LOCALE		/**/
 
-/* I_MEMORY:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <memory.h>.
- */
-/*#define I_MEMORY		/**/
-
 /* I_NET_ERRNO:
  *	This symbol, if defined, indicates that <net/errno.h> exists and
  *	should be included.
diff --git a/win32/config_H.gc b/win32/config_H.gc
index da273a25d9..9bd3db7437 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -626,12 +626,6 @@
  */
 #define	I_LOCALE		/**/
 
-/* I_MEMORY:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <memory.h>.
- */
-/*#define I_MEMORY		/ **/
-
 /* I_NETINET_IN:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <netinet/in.h>. Otherwise, you may try <sys/in.h>.
diff --git a/win32/config_H.vc b/win32/config_H.vc
index 9d55dfe4d5..f4bb807cdb 100644
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -626,12 +626,6 @@
  */
 #define	I_LOCALE		/**/
 
-/* I_MEMORY:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <memory.h>.
- */
-/*#define I_MEMORY		/ **/
-
 /* I_NETINET_IN:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <netinet/in.h>. Otherwise, you may try <sys/in.h>.