diff options
| author | Christopher Faylor <me@cgf.cx> | 2003-03-08 04:57:41 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2003-03-08 04:57:41 +0000 |
| commit | 01d615435c88d73c50ea0818544633a20c6db232 (patch) | |
| tree | c5a1cc663c7d50ce33a6cbbb09e1565c5a4c024f | |
| parent | 762520f3bc4d160d2af658f5dd59dfd09d76bc7f (diff) | |
| download | newlib-01d615435c88d73c50ea0818544633a20c6db232.zip newlib-01d615435c88d73c50ea0818544633a20c6db232.tar.gz newlib-01d615435c88d73c50ea0818544633a20c6db232.tar.bz2 | |
* libc/include/sys/unistd.h: Guard getopt.h call to force only declaration of
getopt and avoid getopt_long declaration.
* libc/sys/cygwin/include/unistd.h: Remove.
| -rw-r--r-- | newlib/ChangeLog | 6 | ||||
| -rw-r--r-- | newlib/libc/include/sys/unistd.h | 2 | ||||
| -rw-r--r-- | newlib/libc/sys/cygwin/include/unistd.h | 11 |
3 files changed, 8 insertions, 11 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index ba0adba..e9c7891 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,9 @@ +2003-03-07 Christopher Faylor <cgf@redhat.com> + + * libc/include/sys/unistd.h: Guard getopt.h call to force only + declaration of getopt and avoid getopt_long declaration. + * libc/sys/cygwin/include/unistd.h: Remove. + 2003-03-07 Corinna Vinschen <corinna@vinschen.de> * configure.host: Define stdio64_dir for Cygwin. diff --git a/newlib/libc/include/sys/unistd.h b/newlib/libc/include/sys/unistd.h index 270be89..8879ee6 100644 --- a/newlib/libc/include/sys/unistd.h +++ b/newlib/libc/include/sys/unistd.h @@ -126,7 +126,9 @@ int _EXFUN(vhangup, (void )); _READ_WRITE_RETURN_TYPE _EXFUN(write, (int __fd, const void *__buf, size_t __nbyte )); #ifdef __CYGWIN__ +# define __UNISTD_GETOPT__ # include <getopt.h> +# undef __UNISTD_GETOPT__ #else extern char *optarg; /* getopt(3) external variables */ extern int optind, opterr, optopt; diff --git a/newlib/libc/sys/cygwin/include/unistd.h b/newlib/libc/sys/cygwin/include/unistd.h deleted file mode 100644 index 9818176..0000000 --- a/newlib/libc/sys/cygwin/include/unistd.h +++ /dev/null @@ -1,11 +0,0 @@ -/* unistd.h for Cygwin. */ - -#ifndef _UNISTD_H_ -#define _UNISTD_H_ - -# include <sys/unistd.h> -# define __UNISTD_GETOPT__ -# include <getopt.h> -# undef __UNISTD_GETOPT__ - -#endif /* _UNISTD_H_ */ |