* 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__.
This commit is contained in:
		| @@ -1,3 +1,14 @@ | ||||
| 2008-09-11  Christopher Faylor  <me+cygwin@cgf.cx> | ||||
|  | ||||
| 	* 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__. | ||||
|  | ||||
| 2008-09-11  Christopher Faylor  <me+cygwin@cgf.cx> | ||||
|  | ||||
| 	* localtime.cc (increment_overflow): Mark as non-inline to prevent | ||||
|   | ||||
| @@ -25,6 +25,7 @@ reent_data DATA | ||||
| sys_errlist = _sys_errlist DATA | ||||
| _sys_errlist DATA | ||||
| sys_nerr = _sys_nerr DATA | ||||
| sys_sigabbrev DATA | ||||
| _sys_nerr DATA | ||||
| _timezone DATA | ||||
| _tzname DATA | ||||
|   | ||||
| @@ -51,8 +51,8 @@ bool allow_glob = true; | ||||
| bool NO_COPY in_forkee; | ||||
|  | ||||
| int __argc_safe; | ||||
| int _declspec(dllexport) __argc; | ||||
| char _declspec(dllexport) **__argv; | ||||
| int __argc; | ||||
| char **__argv; | ||||
| #ifdef NEWVFORK | ||||
| vfork_save NO_COPY *main_vfork; | ||||
| #endif | ||||
| @@ -103,7 +103,7 @@ extern "C" | ||||
|    /* impure_ptr */ _GLOBAL_REENT, | ||||
|   }; | ||||
|   bool ignore_case_with_glob; | ||||
|   int __declspec (dllexport) _check_for_executable = true; | ||||
|   int _check_for_executable = true; | ||||
| }; | ||||
|  | ||||
| int NO_COPY __api_fatal_exit_val = 1; | ||||
|   | ||||
| @@ -143,7 +143,7 @@ static NO_COPY struct | ||||
| }; | ||||
|  | ||||
| extern "C" { | ||||
| const char __declspec(dllexport) * _sys_errlist[] NO_COPY_INIT = | ||||
| const char *_sys_errlist[] NO_COPY_INIT = | ||||
| { | ||||
| /* NOERROR 0 */		  "No error", | ||||
| /* EPERM 1 */		  "Operation not permitted", | ||||
|   | ||||
| @@ -269,7 +269,11 @@ _sig_func_ptr sigset (int, _sig_func_ptr); | ||||
|  | ||||
| int sigqueue(pid_t, int, const union sigval); | ||||
| int siginterrupt (int, int); | ||||
| #ifdef __INSIDE_CYGWIN__ | ||||
| extern const char *sys_sigabbrev[]; | ||||
| #else | ||||
| extern const char __declspec(dllimport) *sys_sigabbrev[]; | ||||
| #endif | ||||
|  | ||||
| #ifdef __cplusplus | ||||
| } | ||||
|   | ||||
| @@ -51,18 +51,19 @@ | ||||
|  | ||||
| #include <err.h> | ||||
| #include <errno.h> | ||||
| #include <getopt.h> | ||||
| #include <stdlib.h> | ||||
| #include <string.h> | ||||
| #define __INSIDE_CYGWIN__ | ||||
| #include <getopt.h> | ||||
|  | ||||
| #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 != ':')) | ||||
|   | ||||
| @@ -57,7 +57,7 @@ struct sigdesc | ||||
|  | ||||
| #define _s(n, s) #n | ||||
| #define _s2(n, s, n1, s1) #n | ||||
| const char __declspec(dllexport) * sys_sigabbrev[] NO_COPY_INIT = | ||||
| const char *sys_sigabbrev[] NO_COPY_INIT = | ||||
| { | ||||
|   NULL, | ||||
|   __signals | ||||
|   | ||||
		Reference in New Issue
	
	Block a user