diff options
| author | Earnie Boyd <earnie@users.sf.net> | 2001-01-28 16:40:19 +0000 |
|---|---|---|
| committer | Earnie Boyd <earnie@users.sf.net> | 2001-01-28 16:40:19 +0000 |
| commit | 4586200df3b7712fb7fda32a73bc7b8b4bd35cfd (patch) | |
| tree | 6ba4e0da97f11db3577c946e47fe745bc0d863f3 /winsup/mingw/include/stdlib.h | |
| parent | d28fea6f4e50dda442a52774a15fed10b264c46d (diff) | |
| download | cygnal-4586200df3b7712fb7fda32a73bc7b8b4bd35cfd.tar.gz cygnal-4586200df3b7712fb7fda32a73bc7b8b4bd35cfd.tar.bz2 cygnal-4586200df3b7712fb7fda32a73bc7b8b4bd35cfd.zip | |
*include/stdlib.h (__p__pgmptr): add prototype.
(__p__wpgmptr): likewise.
(_pgmptr_dll): move declaration from dos.h.
(_wpgmptr_dll): likewise.
(_pgmptr): conditional define (MSVCT/CRTDLL).
(_wpgmptr): likewise.
*include/dos.h (_base*_dll variables): declare only for CRTDLL.
(_os*_dll variables): likewise.
(_pgmptr_dll): remove declaration and associated defines to stdlib.h.
(_wpgmptr_dll): likewise.
Diffstat (limited to 'winsup/mingw/include/stdlib.h')
| -rw-r--r-- | winsup/mingw/include/stdlib.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/winsup/mingw/include/stdlib.h b/winsup/mingw/include/stdlib.h index 71593de42..64d8867d7 100644 --- a/winsup/mingw/include/stdlib.h +++ b/winsup/mingw/include/stdlib.h @@ -252,6 +252,27 @@ __MINGW_IMPORT unsigned int _winminor_dll; #endif +#if defined __MSVCRT__ +/* although the _pgmptr is exported as DATA, + * be safe and use the access function __p__pgmptr() to get it. */ +char** __p__pgmptr(void); +#define _pgmptr (*__p__pgmptr()) +wchar_t** __p__wpgmptr(void); +#define _wpgmptr (*__p__wpgmptr()) +#else /* ! __MSVCRT__ */ +# ifndef __DECLSPEC_SUPPORTED + extern char** __imp__pgmptr_dll; +# define _pgmptr (*__imp__pgmptr_dll) + extern wchar_t** __imp_wpgmptr_dll; +# define _wpgmptr (*__imp__wpgmptr_dll) +# else /* __DECLSPEC_SUPPORTED */ + __MINGW_IMPORT char* _pgmptr_dll; +# define _pgmptr _pgmptr_dll + __MINGW_IMPORT wchar_t* _wpgmptr_dll; +# define _wpgmptr _wpgmptr_dll +# endif /* __DECLSPEC_SUPPORTED */ +#endif /* __MSVCRT__ */ + #endif /* Not __STRICT_ANSI__ */ #ifdef __GNUC__ |