summaryrefslogtreecommitdiff
path: root/src/gmalloc.c
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2008-10-02 02:58:01 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2008-10-02 02:58:01 +0000
commit65f451d083e946cdee6278ebe8ffbc4705d9328b (patch)
treeaffefec9dc375675e65a72761b618878c6c473eb /src/gmalloc.c
parent97f6e1ad87856872182b653d96c555cabee39cdc (diff)
* gmalloc.c (__sbrk): Also define for uClibc.
* s/gnu-linux.h (GNU_LIBRARY_PENDING_OUTPUT_COUNT): Add definition for uClibc.
Diffstat (limited to 'src/gmalloc.c')
-rw-r--r--src/gmalloc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c
index 1cf9a8ee9b..f1be37ba34 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -1706,17 +1706,17 @@ MA 02110-1301, USA. */
#include <malloc.h>
#endif
-#ifndef __GNU_LIBRARY__
+/* uClibc defines __GNU_LIBRARY__, but it is not completely
+ compatible. */
+#if !defined(__GNU_LIBRARY__) || defined(__UCLIBC__)
#define __sbrk sbrk
-#endif
-
-#ifdef __GNU_LIBRARY__
+#else /* __GNU_LIBRARY__ && ! defined (__UCLIBC__) */
/* It is best not to declare this and cast its result on foreign operating
systems with potentially hostile include files. */
#include <stddef.h>
extern __ptr_t __sbrk PP ((ptrdiff_t increment));
-#endif
+#endif /* __GNU_LIBRARY__ && ! defined (__UCLIBC__) */
#ifndef NULL
#define NULL 0