summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog4
-rw-r--r--winsup/cygwin/lib/getopt.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 2d5806418..0fc6b0b7d 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 19 12:24:09 2001 Christopher Faylor <cgf@cygnus.com>
+
+ * lib/getopt.c (__progname): Don't declare if not compiling for cygwin.
+
Wed Sep 19 18:07:00 2001 Corinna Vinschen <corinna@vinschen.de>
* lib/getopt.c (getopt_long): Avoid compiler warning.
diff --git a/winsup/cygwin/lib/getopt.c b/winsup/cygwin/lib/getopt.c
index 11f065fc2..e5e4f31a0 100644
--- a/winsup/cygwin/lib/getopt.c
+++ b/winsup/cygwin/lib/getopt.c
@@ -70,6 +70,8 @@ __weak_alias(getopt_long,_getopt_long)
#ifndef __CYGWIN__
#define __progname __argv[0]
+#else
+extern char __declspec(dllimport) *__progname;
#endif
#define IGNORE_FIRST (*options == '-' || *options == '+')
@@ -106,8 +108,6 @@ static const char noarg[] = "option doesn't take an argument -- %.*s";
static const char illoptchar[] = "unknown option -- %c";
static const char illoptstring[] = "unknown option -- %s";
-extern char __declspec(dllimport) *__progname;
-
static void
_vwarnx(const char *fmt, va_list ap)
{