23 files changed, 6 insertions, 79 deletions
diff --git a/Configure b/Configure
index 0507d577df..14495ed219 100755
--- a/Configure
+++ b/Configure
@@ -961,7 +961,6 @@ html3dir=''
 html3direxp=''
 installhtml3dir=''
 i_arpainet=''
-i_assert=''
 i_bfd=''
 i_crypt=''
 db_hashtype=''
@@ -22601,10 +22600,6 @@ case "$yacc" in
 	;;
 esac
 
-: see if this is a assert.h system
-set assert.h i_assert
-eval $inhdr
-
 : see if this is a bfd.h system
 set bfd.h i_bfd
 eval $inhdr
@@ -24409,7 +24404,6 @@ i64type='$i64type'
 i8size='$i8size'
 i8type='$i8type'
 i_arpainet='$i_arpainet'
-i_assert='$i_assert'
 i_bfd='$i_bfd'
 i_bsdioctl='$i_bsdioctl'
 i_crypt='$i_crypt'
diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
index 0e4f128975..feaeb8aac3 100644
--- a/Cross/config.sh-arm-linux
+++ b/Cross/config.sh-arm-linux
@@ -725,7 +725,6 @@ i64type='long long'
 i8size='1'
 i8type='char'
 i_arpainet='define'
-i_assert='define'
 i_bfd='undef'
 i_bsdioctl=''
 i_crypt='define'
diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770
index 1b94e74d05..d0befdad9a 100644
--- a/Cross/config.sh-arm-linux-n770
+++ b/Cross/config.sh-arm-linux-n770
@@ -589,7 +589,6 @@ i64type='long long'
 i8size='1'
 i8type='char'
 i_arpainet='define'
-i_assert='define'
 i_bsdioctl=''
 i_crypt='define'
 i_db='undef'
diff --git a/NetWare/config.wc b/NetWare/config.wc
index 5c369069a9..d98ed362b2 100644
--- a/NetWare/config.wc
+++ b/NetWare/config.wc
@@ -707,7 +707,6 @@ i64type='__int64'
 i8size='1'
 i8type='char'
 i_arpainet='define'
-i_assert='define'
 i_bfd='undef'
 i_bsdioctl=''
 i_crypt='undef'
diff --git a/NetWare/config_H.wc b/NetWare/config_H.wc
index 9fa1f71a36..37b1d2689e 100644
--- a/NetWare/config_H.wc
+++ b/NetWare/config_H.wc
@@ -606,12 +606,6 @@
  */
 #define	I_ARPA_INET		/**/
 
-/* I_ASSERT:
- *	This symbol, if defined, indicates to the C program that it could
- *	include <assert.h> to get the assert() macro.
- */
-#define	I_ASSERT		/**/
-
 /* I_DBM:
  *	This symbol, if defined, indicates that <dbm.h> exists and should
  *	be included.
diff --git a/Porting/Glossary b/Porting/Glossary
index ea8f5c8631..f6d72c5be3 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -3384,11 +3384,6 @@ i_arpainet (i_arpainet.U):
 	This variable conditionally defines the I_ARPA_INET symbol,
 	and indicates whether a C program should include <arpa/inet.h>.
 
-i_assert (i_assert.U):
-	This variable conditionally defines the I_ASSERT symbol, which
-	indicates to the C program that <assert.h> exists and could be
-	included.
-
 i_bfd (i_bfd.U):
 	This variable conditionally defines the I_BFD symbol, and
 	indicates whether a C program can include <bfd.h>.
diff --git a/Porting/config.sh b/Porting/config.sh
index 29dff40946..9a4e0695a4 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -743,7 +743,6 @@ i64type='long'
 i8size='1'
 i8type='signed char'
 i_arpainet='define'
-i_assert='define'
 i_bfd='undef'
 i_bsdioctl=''
 i_crypt='undef'
diff --git a/Porting/config_H b/Porting/config_H
index 9cec42dc29..b56dd606a9 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -3656,12 +3656,6 @@
 #define	FFLUSH_NULL 		/**/
 /*#define	FFLUSH_ALL 		/ **/
 
-/* I_ASSERT:
- *	This symbol, if defined, indicates that <assert.h> exists and
- *	could be included by the C program to get the assert() macro.
- */
-#define	I_ASSERT		/**/
-
 /* I_CRYPT:
  *	This symbol, if defined, indicates that <crypt.h> exists and
  *	should be included.
diff --git a/config_h.SH b/config_h.SH
index f221202d33..ce046ed9e0 100755
--- a/config_h.SH
+++ b/config_h.SH
@@ -3575,12 +3575,6 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 #$fflushNULL	FFLUSH_NULL 		/**/
 #$fflushall	FFLUSH_ALL 		/**/
 
-/* I_ASSERT:
- *	This symbol, if defined, indicates that <assert.h> exists and
- *	could be included by the C program to get the assert() macro.
- */
-#$i_assert	I_ASSERT		/**/
-
 /* I_BFD:
  *	This symbol, if defined, indicates that <bfd.h> exists and
  *	can be included.
diff --git a/configure.com b/configure.com
index 9d050b9e59..8b1106f0b0 100644
--- a/configure.com
+++ b/configure.com
@@ -6531,7 +6531,6 @@ $ WC "i64type='" + i64type + "'"
 $ WC "i8size='" + i8size + "'"
 $ WC "i8type='" + i8type + "'"
 $ WC "i_arpainet='" + i_arpainet + "'"
-$ WC "i_assert='define'"
 $ WC "i_bfd='undef'"
 $ WC "i_bsdioctl='undef'"
 $ WC "i_crypt='undef'"
diff --git a/perl.h b/perl.h
index caf74e2280..2b4c324514 100644
--- a/perl.h
+++ b/perl.h
@@ -3219,12 +3219,10 @@ EXTERN_C int perl_tsa_mutex_unlock(perl_mutex* mutex)
 #  define __attribute__warn_unused_result__
 #endif
 
-#ifdef I_ASSERT
-#  if !defined(DEBUGGING) && !defined(NDEBUG)
-#    define NDEBUG 1
-#  endif
-#  include <assert.h>
+#if !defined(DEBUGGING) && !defined(NDEBUG)
+#  define NDEBUG 1
 #endif
+#include <assert.h>
 
 /* For functions that are marked as __attribute__noreturn__, it's not
    appropriate to call return.  In either case, include the lint directive.
@@ -3965,7 +3963,7 @@ Gid_t getegid (void);
 			"\", line %d", STRINGIFY(what), __LINE__),	\
              (void) 0)), ((void)0))
 
-/* assert() gets defined if DEBUGGING (and I_ASSERT).
+/* assert() gets defined if DEBUGGING.
  * If no DEBUGGING, the <assert.h> has not been included. */
 #ifndef assert
 #  define assert(what)	Perl_assert(what)
diff --git a/plan9/config_h.sample b/plan9/config_h.sample
index 8dbae1a474..2e0b7647a2 100644
--- a/plan9/config_h.sample
+++ b/plan9/config_h.sample
@@ -574,12 +574,6 @@
  */
 #define	I_ARPA_INET		/**/
 
-/* I_ASSERT:
- *	This symbol, if defined, indicates to the C program that it could
- *	include <assert.h> to get the assert() macro.
- */
-#define	I_ASSERT		/**/
-
 /* I_DBM:
  *	This symbol, if defined, indicates that <dbm.h> exists and should
  *	be included.
diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample
index 74c1680738..538e397a26 100644
--- a/plan9/config_sh.sample
+++ b/plan9/config_sh.sample
@@ -719,7 +719,6 @@ i64type='long long'
 i8size='1'
 i8type='char'
 i_arpainet='define'
-i_assert='define'
 i_bfd='undef'
 i_bsdioctl=''
 i_crypt='undef'
diff --git a/symbian/config.sh b/symbian/config.sh
index f7c316f916..eb5b16fd3a 100644
--- a/symbian/config.sh
+++ b/symbian/config.sh
@@ -647,7 +647,6 @@ i64type='int64_t'
 i8size='1'
 i8type='char'
 i_arpainet='undef'
-i_assert='define'
 i_bfd='undef'
 i_bsdioctl=''
 i_crypt='undef'
diff --git a/uconfig.h b/uconfig.h
index 6d767265d9..b028c9783b 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -3540,12 +3540,6 @@
 /*#define	FFLUSH_NULL 		/ **/
 /*#define	FFLUSH_ALL 		/ **/
 
-/* I_ASSERT:
- *	This symbol, if defined, indicates that <assert.h> exists and
- *	could be included by the C program to get the assert() macro.
- */
-#define	I_ASSERT		/**/
-
 /* I_BFD:
  *	This symbol, if defined, indicates that <bfd.h> exists and
  *	can be included.
@@ -5201,6 +5195,6 @@
 #endif
 
 /* Generated from:
- * 614451187d29353fa80ad1412261b053d40e3d76c3d5daf64dd977d9c6f8de80 config_h.SH
- * 0640d4c66813ed73e42a7eb45e34f57662c6fe45b11a157223ff7b1cfa2199ba uconfig.sh
+ * 19dc934d2543aae24f9cd7a20aa97f4f6fa9a3680e4cb3c24d5c9920f0f8fd31 config_h.SH
+ * fa19c21ba6517cbd4de934e966302bd2e3b9c12a3f0b293f005feb16eb5fc8f6 uconfig.sh
  * ex: set ro: */
diff --git a/uconfig.sh b/uconfig.sh
index 560db2d886..a591e8f2d0 100644
--- a/uconfig.sh
+++ b/uconfig.sh
@@ -633,7 +633,6 @@ i64type='int64_t'
 i8size='1'
 i8type='signed char'
 i_arpainet='undef'
-i_assert='define'
 i_bfd='undef'
 i_bsdioctl=''
 i_crypt='undef'
diff --git a/uconfig64.sh b/uconfig64.sh
index c6f64df322..bfa014004f 100644
--- a/uconfig64.sh
+++ b/uconfig64.sh
@@ -633,7 +633,6 @@ i64type='long'
 i8size='1'
 i8type='signed char'
 i_arpainet='undef'
-i_assert='define'
 i_bfd='undef'
 i_bsdioctl=''
 i_crypt='undef'
diff --git a/win32/config.ce b/win32/config.ce
index 956b6cca9c..d7d950253a 100644
--- a/win32/config.ce
+++ b/win32/config.ce
@@ -703,7 +703,6 @@ i64type='__int64'
 i8size='1'
 i8type='char'
 i_arpainet='define'
-i_assert='define'
 i_bfd='undef'
 i_bsdioctl=''
 i_crypt='undef'
diff --git a/win32/config.gc b/win32/config.gc
index b0b27ea481..02c9e3bf09 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -717,7 +717,6 @@ i64type='long long'
 i8size='1'
 i8type='char'
 i_arpainet='define'
-i_assert='define'
 i_bfd='undef'
 i_bsdioctl=''
 i_crypt='undef'
diff --git a/win32/config.vc b/win32/config.vc
index 654a331cbe..1dd71ace91 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -714,7 +714,6 @@ i64type='__int64'
 i8size='1'
 i8type='char'
 i_arpainet='define'
-i_assert='define'
 i_bfd='undef'
 i_bsdioctl=''
 i_crypt='undef'
diff --git a/win32/config_H.ce b/win32/config_H.ce
index 6b7efed0f8..26f0cb8a62 100644
--- a/win32/config_H.ce
+++ b/win32/config_H.ce
@@ -556,12 +556,6 @@
  */
 #define	I_ARPA_INET		/**/
 
-/* I_ASSERT:
- *	This symbol, if defined, indicates to the C program that it could
- *	include <assert.h> to get the assert() macro.
- */
-#define	I_ASSERT		/**/
-
 /* I_DBM:
  *	This symbol, if defined, indicates that <dbm.h> exists and should
  *	be included.
diff --git a/win32/config_H.gc b/win32/config_H.gc
index 7573a3bbc4..da273a25d9 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -3521,12 +3521,6 @@
 #define	FFLUSH_NULL 		/**/
 /*#define	FFLUSH_ALL 		/ **/
 
-/* I_ASSERT:
- *	This symbol, if defined, indicates that <assert.h> exists and
- *	could be included by the C program to get the assert() macro.
- */
-#define	I_ASSERT		/**/
-
 /* I_BFD:
  *	This symbol, if defined, indicates that <bfd.h> exists and
  *	can be included.
diff --git a/win32/config_H.vc b/win32/config_H.vc
index ac258764b4..9d55dfe4d5 100644
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -3512,12 +3512,6 @@
 #define	FFLUSH_NULL 		/**/
 /*#define	FFLUSH_ALL 		/ **/
 
-/* I_ASSERT:
- *	This symbol, if defined, indicates that <assert.h> exists and
- *	could be included by the C program to get the assert() macro.
- */
-#define	I_ASSERT		/**/
-
 /* I_BFD:
  *	This symbol, if defined, indicates that <bfd.h> exists and
  *	can be included.