Remove macros wrongly left for pre-libio case that no longer exists.

diff --git a/ChangeLog b/ChangeLog
index 3069c3a..a802b93 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-15  Roland McGrath  <roland@hack.frob.com>
+
+       * mach/devstream.c (cookie_io_functions_t): Macro removed.
+       (write, read, close): Likewise.
+       Patch by Aurelien Jarno <aurelien@aurel32.net>.
+
 2012-02-15  Joseph Myers  <joseph@codesourcery.com>
 
        * sysdeps/unix/sysv/linux/bits/signalfd.h: New file.

diff --git a/mach/devstream.c b/mach/devstream.c
index 7c5a783..0f515c2 100644 (file)
--- 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,2011 Free Software Foundation, Inc.
+   Copyright (C) 1992-2012 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
@@ -119,11 +119,6 @@ dealloc_ref (void *cookie)
   return 0;
 }
 
-#define cookie_io_functions_t __io_functions
-#define write __write
-#define read __read
-#define close __close
-
 FILE *
 mach_open_devstream (mach_port_t dev, const char *mode)
 {