[prev in list] [next in list] [prev in thread] [next in thread] 

List:       cygwin-patches
Subject:    [PATCH]: (Retry) Add get{delim,line} symbol alias to avoid autoconf detection failures
From:       Nicholas Wourms <nwourms () gmail ! com>
Date:       2005-07-09 7:00:54
Message-ID: cd3b087a0507090000d5e0c53 () mail ! gmail ! com
[Download RAW message or body]

Sorry,

I forgot to include cdefs.h.  The ChangeLog and the fixed patch is attached=
.

Cheers,
Nicholas

["ChangeLog.txt" (text/plain)]

2005-07-09  Nicholas Wourms  <nwourms@gmail.com>

	* cygwin.din (getline): Add symbol alias to avoid problems with
	autoconf's AC_CHECK_FUNCS macro.
	(getdelim): Likewise.
	* include/sys/stdio.h (getline): Improve clarity by replacing the cpp
	definition with a proper function prototype.
	(getdelim):  Likewise.
	* include/cygwin/version.h: Bump API minor number.
["getdelim-getline-autoconf-fix.2.patch" (application/octet-stream)]

Index: cygwin.din
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/cygwin.din,v
retrieving revision 1.141
diff -u -p -r1.141 cygwin.din
--- cygwin.din	8 Jul 2005 08:24:12 -0000	1.141
+++ cygwin.din	9 Jul 2005 05:22:16 -0000
@@ -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
Index: include/cygwin/version.h
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/include/cygwin/version.h,v
retrieving revision 1.197
diff -u -p -r1.197 version.h
--- include/cygwin/version.h	8 Jul 2005 08:24:12 -0000	1.197
+++ include/cygwin/version.h	9 Jul 2005 05:22:16 -0000
@@ -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
Index: include/sys/stdio.h
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/include/sys/stdio.h,v
retrieving revision 1.4
diff -u -p -r1.4 stdio.h
--- include/sys/stdio.h	8 Jul 2005 08:24:13 -0000	1.4
+++ include/sys/stdio.h	9 Jul 2005 05:22:16 -0000
@@ -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


[prev in list] [next in list] [prev in thread] [next in thread]