svn commit: branches/uClibc-nptl: libc/misc/wchar utils

[sjhill at uclibc.org]

Author: sjhill
Date: 2005-12-10 11:12:19 -0800 (Sat, 10 Dec 2005)
New Revision: 12827

Log:
Merge from trunk.


Modified:
   branches/uClibc-nptl/libc/misc/wchar/wstdio.c
   branches/uClibc-nptl/utils/Makefile.in
   branches/uClibc-nptl/utils/ldd.c


Changeset:
Modified: branches/uClibc-nptl/libc/misc/wchar/wstdio.c
===================================================================
--- branches/uClibc-nptl/libc/misc/wchar/wstdio.c	2005-12-10 19:08:01 UTC (rev 12826)
+++ branches/uClibc-nptl/libc/misc/wchar/wstdio.c	2005-12-10 19:12:19 UTC (rev 12827)
@@ -263,8 +263,8 @@
 	return wi;
 }
 
-strong_alias(fgetwc_unlocked,getwc_unlocked);
-strong_alias(fgetwc,getwc);
+strong_alias(fgetwc_unlocked,getwc_unlocked)
+strong_alias(fgetwc,getwc)
 
 #endif
 /**********************************************************************/
@@ -329,8 +329,8 @@
 #endif
 }
 
-strong_alias(fputwc_unlocked,putwc_unlocked);
-strong_alias(fputwc,putwc);
+strong_alias(fputwc_unlocked,putwc_unlocked)
+strong_alias(fputwc,putwc)
 
 #endif
 /**********************************************************************/

Modified: branches/uClibc-nptl/utils/Makefile.in
===================================================================
--- branches/uClibc-nptl/utils/Makefile.in	2005-12-10 19:08:01 UTC (rev 12826)
+++ branches/uClibc-nptl/utils/Makefile.in	2005-12-10 19:12:19 UTC (rev 12827)
@@ -20,7 +20,8 @@
 
 CFLAGS-ldd := $(CFLAGS-utils-common) $(CFLAGS-utils-shared) -D_GNU_SOURCE
 
-CFLAGS-iconv := $(CFLAGS-utils-shared) -DL_iconv_main
+# needs CFLAGS-utils explicitely, because the source file is not located in utils
+CFLAGS-iconv := $(CFLAGS-utils) $(CFLAGS-utils-shared) -DL_iconv_main
 
 CFLAGS-readelf := $(CFLAGS-utils-shared)
 

Modified: branches/uClibc-nptl/utils/ldd.c
===================================================================
--- branches/uClibc-nptl/utils/ldd.c	2005-12-10 19:08:01 UTC (rev 12826)
+++ branches/uClibc-nptl/utils/ldd.c	2005-12-10 19:12:19 UTC (rev 12827)
@@ -26,7 +26,9 @@
  *
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>