diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | libc/misc/wchar/wchar.c | 4 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/bits/uClibc_stdio.h | 8 |
3 files changed, 6 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 8f65678dd..40a0c4d03 100644 --- a/Makefile.in +++ b/Makefile.in @@ -114,6 +114,8 @@ install_headers: fi ; \ tar -chf - --exclude .svn $$extra_exclude include \ | tar -xf - -C $(PREFIX)$(DEVEL_PREFIX) + echo -e '#ifndef _LIBC_INTERNAL_H\n#define _LIBC_INTERNAL_H 1\n#endif\n' > \ + $(PREFIX)$(DEVEL_PREFIX)include/libc-internal.h $(RM) $(PREFIX)$(DEVEL_PREFIX)include/dl-osinfo.h $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/uClibc_uintmaxtostr.h ifneq ($(UCLIBC_HAS_FLOATS),y) diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c index 0d7d8371a..1a16fc9d6 100644 --- a/libc/misc/wchar/wchar.c +++ b/libc/misc/wchar/wchar.c @@ -98,10 +98,6 @@ * Manuel */ -#define vfprintf __vfprintf -#define fread __fread -#define fwrite __fwrite - #define _GNU_SOURCE #define _ISOC99_SOURCE #include <errno.h> diff --git a/libc/sysdeps/linux/common/bits/uClibc_stdio.h b/libc/sysdeps/linux/common/bits/uClibc_stdio.h index 1b3f839a4..04844ac6a 100644 --- a/libc/sysdeps/linux/common/bits/uClibc_stdio.h +++ b/libc/sysdeps/linux/common/bits/uClibc_stdio.h @@ -68,7 +68,7 @@ /**********************************************************************/ /* Make sure defines related to large files are consistent. */ -#ifdef _LIBC +#if defined _LIBC && (defined IS_IN_libc || defined NOT_IN_libc) #ifdef __UCLIBC_HAS_LFS__ #undef __USE_LARGEFILE @@ -395,7 +395,7 @@ struct __STDIO_FILE_STRUCT { /********************************************************************** * PROTOTYPES OF INTERNAL FUNCTIONS **********************************************************************/ -#ifdef _LIBC +#if defined _LIBC && (defined IS_IN_libc || defined NOT_IN_libc) extern void _stdio_init(void); extern void _stdio_term(void); @@ -412,9 +412,9 @@ extern pthread_mutex_t _stdio_openlist_lock; #endif extern int _stdio_openlist_delflag; extern int _stdio_user_locking; -#ifdef _LIBC +/* #ifdef _LIBC */ extern void __stdio_init_mutex(pthread_mutex_t *m) attribute_hidden; -#endif +/* #endif */ #endif #endif |