From 4cc9a82e3ef3e785c720133b737c3713e6582b62 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Sat, 9 Jul 2005 08:22:39 +0000
Subject: [PATCH] 	* cygwin.din (getline): Export. 	(getdelim):
 Export. 	* include/sys/stdio.h (getline): Replace macro with function
 prototype. 	(getdelim):  Likewise. 	* include/cygwin/version.h: Bump API
 minor number.

---
 winsup/cygwin/ChangeLog                | 8 ++++++++
 winsup/cygwin/cygwin.din               | 6 ++++--
 winsup/cygwin/include/cygwin/version.h | 3 ++-
 winsup/cygwin/include/sys/stdio.h      | 9 +++++++--
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4af8da863..f49a641d4 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-09  Nicholas Wourms  <nwourms@gmail.com>
+
+	* cygwin.din (getline): Export.
+	(getdelim): Export.
+	* include/sys/stdio.h (getline): Replace macro with function prototype.
+	(getdelim):  Likewise.
+	* include/cygwin/version.h: Bump API minor number.
+
 2005-07-08  Corinna Vinschen  <corinna@vinschen.de>
 
 	* cygwin.din (__getline): Export.
diff --git a/winsup/cygwin/cygwin.din b/winsup/cygwin/cygwin.din
index ca15a616b..3e550e23a 100644
--- a/winsup/cygwin/cygwin.din
+++ b/winsup/cygwin/cygwin.din
@@ -35,8 +35,6 @@ __eprintf SIGFE
 __errno NOSIGFE
 __fpclassifyd NOSIGFE
 __fpclassifyf NOSIGFE
-__getline NOSIGFE
-__getdelim NOSIGFE
 __getreent NOSIGFE
 __infinity NOSIGFE
 __main NOSIGFE
@@ -613,6 +611,8 @@ getchar_unlocked SIGFE
 _getchar_unlocked = getchar_unlocked SIGFE
 getcwd SIGFE
 _getcwd = getcwd SIGFE
+__getdelim NOSIGFE
+getdelim = __getdelim NOSIGFE
 getdomainname SIGFE
 _getdomainname = getdomainname SIGFE
 getdtablesize NOSIGFE
@@ -644,6 +644,8 @@ _getgroups = getgroups SIGFE
 _getgroups32 = getgroups32 SIGFE
 gethostid SIGFE
 getitimer SIGFE
+__getline NOSIGFE
+getline = __getline NOSIGFE
 getlogin_r NOSIGFE
 getlogin NOSIGFE
 _getlogin = getlogin NOSIGFE
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
index fd4eb5810..e7f2b454e 100644
--- a/winsup/cygwin/include/cygwin/version.h
+++ b/winsup/cygwin/include/cygwin/version.h
@@ -260,12 +260,13 @@ details. */
       131: Export inet_ntop, inet_pton.
       132: Add GLOB_LIMIT flag to glob.
       133: Export __getline, __getdelim.
+      134: Export getline, getdelim.
      */
 
      /* Note that we forgot to bump the api for ualarm, strtoll, strtoull */
 
 #define CYGWIN_VERSION_API_MAJOR 0
-#define CYGWIN_VERSION_API_MINOR 133
+#define CYGWIN_VERSION_API_MINOR 134
 
      /* There is also a compatibity version number associated with the
 	shared memory regions.  It is incremented when incompatible
diff --git a/winsup/cygwin/include/sys/stdio.h b/winsup/cygwin/include/sys/stdio.h
index 71ef307ab..8d002ddba 100644
--- a/winsup/cygwin/include/sys/stdio.h
+++ b/winsup/cygwin/include/sys/stdio.h
@@ -11,6 +11,7 @@ details. */
 #ifndef _SYS_STDIO_H_
 #define _SYS_STDIO_H_
 
+#include <sys/cdefs.h>
 #include <sys/lock.h>
 
 #if !defined(__SINGLE_THREAD__)
@@ -25,7 +26,11 @@ details. */
 #  endif
 #endif
 
-#define getline __getline
-#define getdelim __getdelim
+__BEGIN_DECLS
+
+ssize_t	_EXFUN(getline, (char **, size_t *, FILE *));
+ssize_t	_EXFUN(getdelim, (char **, size_t *, int, FILE *));
+
+__END_DECLS
 
 #endif