diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2011-10-09 21:34:41 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2011-10-09 21:34:41 +0200 |
| commit | bc57f97ac6e4eae85a71771b09e2c1d3b7d9f46c (patch) | |
| tree | 26e2948ca5e7bd3130f1cd9d5d18e399aa9ab3d0 /mach | |
| parent | 0888005afb4f0e138659dfb1751ae3bd1a5e39be (diff) | |
| parent | 187da0aedcd9d0a2fb34477bef41549681ba1273 (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
configure
elf/elf.h
include/errno.h
sysdeps/ia64/elf/configure
sysdeps/mach/hurd/tls.h
sysdeps/powerpc/powerpc32/elf/configure
sysdeps/powerpc/powerpc64/elf/configure
sysdeps/s390/s390-32/elf/configure
sysdeps/s390/s390-64/elf/configure
sysdeps/sh/elf/configure
sysdeps/sparc/sparc32/elf/configure
sysdeps/sparc/sparc64/elf/configure
Diffstat (limited to 'mach')
| -rw-r--r-- | mach/devstream.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mach/devstream.c b/mach/devstream.c index 1c51695a87..ebc4b9329b 100644 --- a/mach/devstream.c +++ b/mach/devstream.c @@ -1,6 +1,6 @@ /* stdio on a Mach device port. Translates \n to \r\n on output, echos and translates \r to \n on input. - Copyright (C) 1992,93,94,96,97,2000 Free Software Foundation, Inc. + Copyright (C) 1992,93,94,96,97,2000,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 @@ -120,12 +120,10 @@ dealloc_ref (void *cookie) return 0; } -#ifndef USE_IN_LIBIO #define cookie_io_functions_t __io_functions #define write __write #define read __read #define close __close -#endif FILE * mach_open_devstream (mach_port_t dev, const char *mode) |