From e83c3d0ae5dec854ef6e69d5268cd9a1b7745fd8 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Fri, 22 Sep 2006 19:33:11 +0000
Subject: [PATCH] 2006-09-22  Paul Brook  <paul@codesourcery.com>

        * libc/include/sys/reent.h: Define and use __reent_assert.
---
 newlib/ChangeLog                | 4 ++++
 newlib/libc/include/sys/reent.h | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 0f882ffa2..e5ab0fd04 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-22  Paul Brook  <paul@codesourcery.com>
+
+	* libc/include/sys/reent.h: Define and use __reent_assert.
+
 2006-09-13  Joel Sherrill <joel@oarcorp.com>
 
 	* libc/include/pthread.h: Add pthread barriers,
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index 7911b6cbc..3ef605828 100644
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -459,8 +459,9 @@ struct _reent
 /* Only built the assert() calls if we are built with debugging.  */
 #if DEBUG 
 #include <assert.h>
+#define __reent_assert(x) assert(x)
 #else
-#define assert(x) ((void)0)
+#define __reent_assert(x) ((void)0)
 #endif
 
 /* Generic _REENT check macro.  */
@@ -468,7 +469,7 @@ struct _reent
   struct _reent *_r = (var); \
   if (_r->what == NULL) { \
     _r->what = (type)malloc(size); \
-    assert(_r->what); \
+    __reent_assert(_r->what); \
     init; \
   } \
 } while (0)