From 9e5ad282f006529cc62d30bd3eb54b14f6e5bf1d Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Wed, 19 Sep 2001 16:24:10 +0000 Subject: [PATCH] * lib/getopt.c (__progname): Don't declare if not compiling for cygwin. --- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/lib/getopt.c | 4 ++-- 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 + + * lib/getopt.c (__progname): Don't declare if not compiling for cygwin. + Wed Sep 19 18:07:00 2001 Corinna Vinschen * 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) {