mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-06 14:02:07 -08:00
Code Issues Projects Releases Wiki Activity

* gmalloc.c (__sbrk): Also define for uClibc.

Browse source 
* s/gnu-linux.h (GNU_LIBRARY_PENDING_OUTPUT_COUNT): Add definition
for uClibc.
This commit is contained in:
Dan Nicolaescu 2008-10-02 02:58:01 +00:00
parent 97f6e1ad87
commit 65f451d083
3 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -1,3 +1,10 @@
2008-10-02 Dan Nicolaescu <dann@ics.uci.edu>
* gmalloc.c (__sbrk): Also define for uClibc.
* s/gnu-linux.h (GNU_LIBRARY_PENDING_OUTPUT_COUNT): Add definition
for uClibc.
2008-10-01 Adrian Robert <Adrian.B.Robert@gmail.com>
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal

10
src/gmalloc.c
View file

@ -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

8
src/s/gnu-linux.h
View file

@ -156,11 +156,15 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* new C libio names */
#define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
((FILE)->_IO_write_ptr - (FILE)->_IO_write_base)
#else /* !_IO_STDIO_H */
#elif defined (__UCLIBC__)
/* using the uClibc library */
#define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
((FILE)->__bufpos - (FILE)->__bufstart)
#else /* !_IO_STDIO_H && ! __UCLIBC__ */
/* old C++ iostream names */
#define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
((FILE)->_pptr - (FILE)->_pbase)
#endif /* !_IO_STDIO_H */
#endif /* !_IO_STDIO_H && ! __UCLIBC__ */
#endif /* emacs */
/* Ask GCC where to find libgcc.a. */