From: Roland McGrath <roland@hack.frob.com>
Date: Wed, 15 Feb 2012 20:23:13 +0000 (-0800)
Subject: Remove macros wrongly left for pre-libio case that no longer exists.
X-Git-Tag: glibc-2.16-tps~1006
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1cac72362af836bf205b40998f26b074a97873bc;p=thirdparty%2Fglibc.git

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

diff --git a/ChangeLog b/ChangeLog
index 3069c3aaa0f..a802b93d921 100644
--- 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 7c5a783cbbd..0f515c29256 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,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)
 {