aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2002-12-28 23:20:47 +0000
committerChristopher Faylor <me@cgf.cx>2002-12-28 23:20:47 +0000
commit5c581ecaf63091451ef6572ef70041f661d09d19 (patch)
treebe74075cae6b9d07528e65243df06b379d5a7607
parent6d48dd20ba8333b650f15d0277c46949fe934312 (diff)
downloadnewlib-5c581ecaf63091451ef6572ef70041f661d09d19.zip
newlib-5c581ecaf63091451ef6572ef70041f661d09d19.tar.gz
newlib-5c581ecaf63091451ef6572ef70041f661d09d19.tar.bz2
* libc/include/sys/unistd.h: Under cygwin, just include getopt.h rather than
defining getopt directly.
-rw-r--r--newlib/ChangeLog5
-rw-r--r--newlib/libc/include/sys/unistd.h4
2 files changed, 9 insertions, 0 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 6421329..1d7d2cc 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-28 Christopher Faylor <cgf@redhat.com>
+
+ * libc/include/sys/unistd.h: Under cygwin, just include getopt.h rather
+ than defining getopt directly.
+
2002-12-20 Jeff Johnston <jjohnstn@redhat.com>
* NEWS: Update with 1.11.0 info.
diff --git a/newlib/libc/include/sys/unistd.h b/newlib/libc/include/sys/unistd.h
index 06773cc..b5ed650 100644
--- a/newlib/libc/include/sys/unistd.h
+++ b/newlib/libc/include/sys/unistd.h
@@ -120,10 +120,14 @@ int _EXFUN(unlink, (const char *__path ));
int _EXFUN(vhangup, (void ));
_READ_WRITE_RETURN_TYPE _EXFUN(write, (int __fd, const void *__buf, size_t __nbyte ));
+#ifdef __CYGWIN__
+# include <getopt.h>
+#else
extern char *optarg; /* getopt(3) external variables */
extern int optind, opterr, optopt;
int getopt(int, char * const [], const char *);
extern int optreset; /* getopt(3) external variable */
+#endif
#ifndef _POSIX_SOURCE
pid_t _EXFUN(vfork, (void ));