aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2006-01-05 17:35:14 +0000
committerChristopher Faylor <me@cgf.cx>2006-01-05 17:35:14 +0000
commitb39b8c14fa6484710af9b1d9bef286f15581d1e5 (patch)
tree9bde20986bc4c44a79c68722a235b5f9869abe60
parent4cf4fd4d1c413ac782504183ec614aed0ed68fb6 (diff)
downloadnewlib-b39b8c14fa6484710af9b1d9bef286f15581d1e5.zip
newlib-b39b8c14fa6484710af9b1d9bef286f15581d1e5.tar.gz
newlib-b39b8c14fa6484710af9b1d9bef286f15581d1e5.tar.bz2
* include/getopt.h: Accommodate recent unfortunate newlib changes.
-rw-r--r--winsup/cygwin/ChangeLog4
-rw-r--r--winsup/cygwin/include/getopt.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4202ca0..ff80caf 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,9 @@
2006-01-05 Christopher Faylor <cgf@timesys.com>
+ * include/getopt.h: Accommodate recent unfortunate newlib changes.
+
+2006-01-05 Christopher Faylor <cgf@timesys.com>
+
* cygtls.cc (_cygtls::remove): Don't output debugging info if this
isn't a cygwin thread.
* sigproc.cc (sigproc_init): Move clearing of sync_startup here to
diff --git a/winsup/cygwin/include/getopt.h b/winsup/cygwin/include/getopt.h
index ba095ba..1efff1c 100644
--- a/winsup/cygwin/include/getopt.h
+++ b/winsup/cygwin/include/getopt.h
@@ -31,6 +31,9 @@
* SUCH DAMAGE.
*/
+#ifdef _COMPILING_NEWLIB
+#include_next "getopt.h"
+#else
#ifndef __GETOPT_H__
#define __GETOPT_H__
@@ -84,3 +87,4 @@ int getopt_long (int, char *const *, const char *, const struct option *, int *)
#endif /* __GETOPT_LONG_H__ */
#endif /* __UNISTD_GETOPT__ */
+#endif /*_INSIDE_NEWLIB*/