diff options
Diffstat (limited to 'stdio-common')
-rw-r--r-- | stdio-common/isoc99_vsscanf.c | 6 | ||||
-rw-r--r-- | stdio-common/stdio_lim.h.in | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/stdio-common/isoc99_vsscanf.c b/stdio-common/isoc99_vsscanf.c index f10919c79a..b11cf603d3 100644 --- a/stdio-common/isoc99_vsscanf.c +++ b/stdio-common/isoc99_vsscanf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997-2003, 2006, 2007 Free Software Foundation, Inc. +/* Copyright (C) 1993,1997-2003,2006,2007,2009 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 @@ -38,10 +38,10 @@ __isoc99_vsscanf (const char *string, const char *format, _IO_va_list args) sf._sbf._f._lock = NULL; #endif _IO_no_init (&sf._sbf._f, _IO_USER_LOCK, -1, NULL, NULL); - _IO_JUMPS ((struct _IO_FILE_plus *) &sf._sbf) = &_IO_str_jumps; + _IO_JUMPS (&sf._sbf) = &_IO_str_jumps; _IO_str_init_static_internal (&sf, (char*)string, 0, NULL); sf._sbf._f._flags2 |= _IO_FLAGS2_SCANF_STD; - ret = INTUSE(_IO_vfscanf) ((_IO_FILE *) &sf._sbf, format, args, NULL); + ret = INTUSE(_IO_vfscanf) (&sf._sbf._f, format, args, NULL); return ret; } libc_hidden_def (__isoc99_vsscanf) diff --git a/stdio-common/stdio_lim.h.in b/stdio-common/stdio_lim.h.in index bb496c59de..a827255790 100644 --- a/stdio-common/stdio_lim.h.in +++ b/stdio-common/stdio_lim.h.in @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1994, 1997, 1998, 1999, 2009 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 @@ -27,7 +27,9 @@ # ifdef __USE_POSIX # define L_ctermid @L_ctermid@ -# define L_cuserid @L_cuserid@ +# if !defined __USE_XOPEN2K || defined __USE_GNU +# define L_cuserid @L_cuserid@ +# endif # endif #endif |