From c4ca0e800af73f81465603c97484982df0f51b0d Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Thu, 11 Sep 2008 06:22:31 +0000 Subject: * cygwin.din (sys_sigabbrev): Add this here. * dcrt0.cc (__argc,__argv,_check_for_executable): Remove dllexport decoration since it is already handled in cygwin.din. * errno.cc (_sys_errlist): Ditto. * strsig.cc (sys_sigabbrev): Ditto. * include/cygwin/signal.h: Protect use of dllimport when __INSIDE_CYGWIN__. * libc/getopt.c: Revert previous changes. Define __INSIDE_CYGWIN__. --- winsup/cygwin/libc/getopt.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'winsup/cygwin/libc/getopt.c') diff --git a/winsup/cygwin/libc/getopt.c b/winsup/cygwin/libc/getopt.c index dc9bd8981..0b5a18025 100644 --- a/winsup/cygwin/libc/getopt.c +++ b/winsup/cygwin/libc/getopt.c @@ -51,18 +51,19 @@ #include #include -#include #include #include +#define __INSIDE_CYGWIN__ +#include #define REPLACE_GETOPT /* use this getopt as the system getopt(3) */ #ifdef REPLACE_GETOPT -int __declspec(dllexport) opterr = 1; /* if error message should be printed */ -int __declspec(dllexport) optind = 1; /* index into parent argv vector */ -int __declspec(dllexport) optopt = '?';/* index into parent argv vector *//* character checked for validity */ -int __declspec(dllexport) optreset; /* reset getopt */ -char __declspec(dllexport) *optarg; /* argument associated with option */ +int opterr = 1; /* if error message should be printed */ +int optind = 1; /* index into parent argv vector */ +int optopt = '?'; /* character checked for validity */ +int optreset; /* reset getopt */ +char *optarg; /* argument associated with option */ #endif #define PRINT_ERROR ((opterr) && (*options != ':')) -- cgit v1.2.3