diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-02-08 16:44:31 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-02-08 16:44:31 +0000 |
| commit | 78be84cd747c2e3965bf6c2fd5f702d6ff2f5525 (patch) | |
| tree | c070a60ef7c5371bef8b7a559442a6920b394c8e /libc/libio/libio.h | |
| parent | de06548e980675e65a1e6d850bb8c3a3f7ec638d (diff) | |
| download | eglibc2-78be84cd747c2e3965bf6c2fd5f702d6ff2f5525.tar.gz | |
Merge changes between r16568 and r17050 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@17051 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/libio/libio.h')
| -rw-r--r-- | libc/libio/libio.h | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/libc/libio/libio.h b/libc/libio/libio.h index bebc112a3..c37211f8e 100644 --- a/libc/libio/libio.h +++ b/libc/libio/libio.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1991-1995,1997-2006,2007,2009,2011 Free Software Foundation, Inc. +/* Copyright (C) 1991-1995,1997-2007,2009,2011,2012 + Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Per Bothner <bothner@cygnus.com>. @@ -61,26 +62,11 @@ # if _G_HAVE_SYS_CDEFS # include <sys/cdefs.h> # else -# ifdef __STDC__ -# define __P(p) p -# define __PMT(p) p -# else -# define __P(p) () -# define __PMT(p) () -# endif +# define __P(p) p +# define __PMT(p) p # endif #endif /*!__P*/ -/* For backward compatibility */ -#ifndef _PARAMS -# define _PARAMS(protos) __P(protos) -#endif /*!_PARAMS*/ - -#ifndef __STDC__ -# ifndef const -# define const -# endif -#endif #define _IO_UNIFIED_JUMPTABLES 1 #ifndef _G_HAVE_PRINTF_FP # define _IO_USE_DTOA 1 @@ -371,7 +357,7 @@ typedef __ssize_t __io_read_fn (void *__cookie, char *__buf, size_t __nbytes); opened for append (__mode.__append set), then set the file pointer to the end of the file and then do the write; if not, just write at the current file pointer. */ -typedef __ssize_t __io_write_fn (void *__cookie, __const char *__buf, +typedef __ssize_t __io_write_fn (void *__cookie, const char *__buf, size_t __n); /* Move COOKIE's file position to *POS bytes from the |