lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Merge branch 'master' of ssh://sourceware.org/git/glibc

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Ulrich Drepper
2011-09-09 18:21:39 -04:00
parent f22e10748f 0a2349f929
commit e4899e7b9a
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
stdio-common/vfscanf.c
View File

@ -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