Mercurial > emacs

diff src/gmalloc.c @ 98455:876b289a899e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* gmalloc.c (__sbrk): Also define for uClibc. * s/gnu-linux.h (GNU_LIBRARY_PENDING_OUTPUT_COUNT): Add definition for uClibc.
author Dan Nicolaescu <dann@ics.uci.edu>
date Thu, 02 Oct 2008 02:58:01 +0000
parents 6e2a8cad250c
children 84b961690802
line wrap: on
line diff
--- a/src/gmalloc.c	Thu Oct 02 00:49:49 2008 +0000
+++ b/src/gmalloc.c	Thu Oct 02 02:58:01 2008 +0000
@@ -1706,17 +1706,17 @@
 #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