diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-01-11 10:31:49 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-01-11 10:31:49 +0100 |
| commit | c14a0516dbea2e1b794f9a09a8ea182fbe0dc349 (patch) | |
| tree | aea6ef619b1bb3ee704d5904f8209c33933c4822 /libio | |
| parent | a5683508bcdcfcbe8e486cbcdcaa3830d9ab22e8 (diff) | |
| parent | 33780b6d332af9d94216eff880734be7748c2269 (diff) | |
| download | glibc-c14a0516dbea2e1b794f9a09a8ea182fbe0dc349.tar.xz glibc-c14a0516dbea2e1b794f9a09a8ea182fbe0dc349.zip | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/stdio.h | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/libio/stdio.h b/libio/stdio.h index 52e921d7d4..6ca4771830 100644 --- a/libio/stdio.h +++ b/libio/stdio.h @@ -1,5 +1,5 @@ /* Define ISO C stdio on top of C++ iostreams. - Copyright (C) 1991, 1994-2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 1991, 1994-2008, 2009, 2010 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 @@ -74,7 +74,7 @@ typedef struct _IO_FILE __FILE; #include <libio.h> -#ifdef __USE_XOPEN +#if defined __USE_XOPEN || defined __USE_XOPEN2K8 # ifdef __GNUC__ # ifndef _VA_LIST_DEFINED typedef _G_va_list va_list; @@ -85,6 +85,26 @@ typedef _G_va_list va_list; # endif #endif +#ifdef __USE_XOPEN2K8 +# ifndef __off_t_defined +# ifndef __USE_FILE_OFFSET64 +typedef __off_t off_t; +# else +typedef __off64_t off_t; +# endif +# define __off_t_defined +# endif +# if defined __USE_LARGEFILE64 && !defined __off64_t_defined +typedef __off64_t off64_t; +# define __off64_t_defined +# endif + +# ifndef __ssize_t_defined +typedef __ssize_t ssize_t; +# define __ssize_t_defined +# endif +#endif + /* The type of the second argument to `fgetpos' and `fsetpos'. */ __BEGIN_NAMESPACE_STD #ifndef __USE_FILE_OFFSET64 |