svn commit: branches/uClibc-nptl: libc/misc/wchar libc/sysdeps/linux/comm etc...

[sjhill at uclibc.org]

Author: sjhill
Date: 2005-12-12 20:11:05 -0800 (Mon, 12 Dec 2005)
New Revision: 12850

Log:
Merge from trunk.


Modified:
   branches/uClibc-nptl/Makefile.in
   branches/uClibc-nptl/libc/misc/wchar/wchar.c
   branches/uClibc-nptl/libc/sysdeps/linux/common/bits/uClibc_stdio.h


Changeset:
Modified: branches/uClibc-nptl/Makefile.in
===================================================================
--- branches/uClibc-nptl/Makefile.in	2005-12-13 04:06:22 UTC (rev 12849)
+++ branches/uClibc-nptl/Makefile.in	2005-12-13 04:11:05 UTC (rev 12850)
@@ -114,6 +114,8 @@
 	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)

Modified: branches/uClibc-nptl/libc/misc/wchar/wchar.c
===================================================================
--- branches/uClibc-nptl/libc/misc/wchar/wchar.c	2005-12-13 04:06:22 UTC (rev 12849)
+++ branches/uClibc-nptl/libc/misc/wchar/wchar.c	2005-12-13 04:11:05 UTC (rev 12850)
@@ -98,10 +98,6 @@
  * Manuel
  */
 
-#define vfprintf __vfprintf
-#define fread __fread
-#define fwrite __fwrite
-
 #define _GNU_SOURCE
 #define _ISOC99_SOURCE
 #include <errno.h>

Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/bits/uClibc_stdio.h
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/bits/uClibc_stdio.h	2005-12-13 04:06:22 UTC (rev 12849)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/bits/uClibc_stdio.h	2005-12-13 04:11:05 UTC (rev 12850)
@@ -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 @@
 /**********************************************************************
  * 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,10 +412,10 @@
 #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