summaryrefslogtreecommitdiff
path: root/libc/stdio-common
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2009-07-30 22:27:48 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2009-07-30 22:27:48 +0000
commit42296946a6ccf1c1d88abf77ff1cb2b1935a4a7c (patch)
tree1a9b6a848a4558bafe75c66cbc1dc221e25f1a63 /libc/stdio-common
parent9256f6cec752328b02be5ad239c6f9abb37e431d (diff)
Merge changes between r8721 and r8731 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@8732 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/stdio-common')
-rw-r--r--libc/stdio-common/scanf15.c1
-rw-r--r--libc/stdio-common/scanf17.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/libc/stdio-common/scanf15.c b/libc/stdio-common/scanf15.c
index c56715c48..851466b3a 100644
--- a/libc/stdio-common/scanf15.c
+++ b/libc/stdio-common/scanf15.c
@@ -1,5 +1,6 @@
#undef _GNU_SOURCE
#define _XOPEN_SOURCE 600
+#undef _LIBC
/* The following macro definitions are a hack. They word around disabling
the GNU extension while still using a few internal headers. */
#define u_char unsigned char
diff --git a/libc/stdio-common/scanf17.c b/libc/stdio-common/scanf17.c
index ee9024f9b..4478a7022 100644
--- a/libc/stdio-common/scanf17.c
+++ b/libc/stdio-common/scanf17.c
@@ -1,5 +1,6 @@
#undef _GNU_SOURCE
#define _XOPEN_SOURCE 600
+#undef _LIBC
/* The following macro definitions are a hack. They word around disabling
the GNU extension while still using a few internal headers. */
#define u_char unsigned char