diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2011-10-09 12:17:56 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2011-10-09 12:17:56 +0200 |
| commit | 8148eeeabda5b2464cbf3e35a15e9e6bdd5cb701 (patch) | |
| tree | 11b57afe407ba8b89a20db7687c2ca20b0ef1dc3 /mach | |
| parent | 8a381b5ac3e155cf8be99c4a835b6ec751937cca (diff) | |
| parent | 187da0aedcd9d0a2fb34477bef41549681ba1273 (diff) | |
Merge commit 'refs/top-bases/t/tls' into t/tls
Conflicts:
sysdeps/mach/hurd/tls.h
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) |