*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.
This commit is contained in:
@ -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__
|
||||
|
Reference in New Issue
Block a user