summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2006-09-20 23:27:53 +0000
committerPaul Brook <paul@codesourcery.com>2006-09-20 23:27:53 +0000
commit3116c78f01cc85e29ac00d742154dab89cda610c (patch)
treea0cb6772ebb3172b9220df04d6feab1685ce8385
parent92f27c21581cdfdf90627727c9cc6cda914f74cc (diff)
downloadcygnal-3116c78f01cc85e29ac00d742154dab89cda610c.tar.gz
cygnal-3116c78f01cc85e29ac00d742154dab89cda610c.tar.bz2
cygnal-3116c78f01cc85e29ac00d742154dab89cda610c.zip
2006-09-20 Paul Brook <paul@codesourcery.com>
newlib/ * libc/include/sys/reent.h: Define and use __reent_assert.
-rw-r--r--ChangeLog.csl5
-rw-r--r--newlib/libc/include/sys/reent.h5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl
index f57e546aa..93f17ea5d 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,5 +1,10 @@
2006-09-20 Paul Brook <paul@codesourcery.com>
+ newlib/
+ * libc/include/sys/reent.h: Define and use __reent_assert.
+
+2006-09-20 Paul Brook <paul@codesourcery.com>
+
libgloss/
* arm/arm.sc: Add .gnu.linkonce and .ARM.extab sections.
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)