summaryrefslogtreecommitdiff
path: root/stdio-common/vfscanf.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-09-09 18:21:39 -0400
committerUlrich Drepper <drepper@gmail.com>2011-09-09 18:21:39 -0400
commite4899e7b9adbf74145f6530f6f57517f773e330c (patch)
treef8cc421a27739d5e2775478cac6707bd414949d1 /stdio-common/vfscanf.c
parentf22e10748fbabbf07161eb7a5540b8c0e18553c4 (diff)
parent0a2349f929e937fb335ba53e217c05f5aa5d66d5 (diff)
downloadglibc-e4899e7b9adbf74145f6530f6f57517f773e330c.tar.gz
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'stdio-common/vfscanf.c')
-rw-r--r--stdio-common/vfscanf.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index 7356eeb362..9d312d55aa 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2006, 2007, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2006, 2007, 2010, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -48,7 +48,7 @@
#if INT_MAX == LONG_MAX
# define need_long 0
#else
-# define need_long 1
+# define need_long 1
#endif
/* Those are flags in the conversion format. */
@@ -102,9 +102,9 @@
# define __strtof_internal __wcstof_internal
# define L_(Str) L##Str
-# define CHAR_T wchar_t
+# define CHAR_T wchar_t
# define UCHAR_T unsigned int
-# define WINT_T wint_t
+# define WINT_T wint_t
# undef EOF
# define EOF WEOF
#else
@@ -128,7 +128,7 @@
return EOF
# define L_(Str) Str
-# define CHAR_T char
+# define CHAR_T char
# define UCHAR_T unsigned char
# define WINT_T int
#endif