Minor getopt fix for cygwin and NEWS update.

3 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index e4239e99..eafd8af4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-21         Corinna Vinschen      <vinschen@redhat.com>
+
+	* getopt.c: Add Cygwin to list of platforms where it's ok
+	to include <stdlib.h>.
+
 2012-03-20         Arnold D. Robbins     <arnold@skeeve.com>
 
 	Get new getopt to work on Linux and C90 compilers:
diff --git a/NEWS b/NEWS
index 165b94dc..453270dc 100644
--- a/NEWS
+++ b/NEWS
@@ -13,7 +13,9 @@ Changes from 4.0.0 to 4.0.1
 
 2. Completed the implementation of Rational Range Interpretation.
 
-3. Lots of minor bugs fixed and portability clean-ups along the way. See
+3. Failure to get the group set is no longer a fatal error.
+
+4. Lots of minor bugs fixed and portability clean-ups along the way. See
    the ChangeLog for details.
 
 Changes from 3.1.8 to 4.0.0
diff --git a/getopt.c b/getopt.c
index c5c72a23..b1f854af 100644
--- a/getopt.c
+++ b/getopt.c
@@ -58,9 +58,9 @@
 
 /* This needs to come after some library #include
    to get __GNU_LIBRARY__ defined.  */
-#ifdef	__GNU_LIBRARY__
-/* Don't include stdlib.h for non-GNU C libraries because some of them
-   contain conflicting prototypes for getopt.  */
+#if defined (__GNU_LIBRARY__) || defined (__CYGWIN__)
+/* Don't include stdlib.h for non-GNU C libraries and non-Cygwin because some
+   of them contain conflicting prototypes for getopt.  */
 # include <stdlib.h>
 # include <unistd.h>
 #endif	/* GNU C library.  */