mirrors/mingw-w64
1
0
Fork 0
mirror of https://git.code.sf.net/p/mingw-w64/mingw-w64 synced 2024-11-23 18:04:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

headers: Unified declaration of __argc, __argv, __wargv, _environ, _wenviron, _pgmptr, _wpgmptr, _osplatform, _osver, _winver, _winmajor, _winminor

Browse Source 
Declare __argc, __argv, __wargv, _pgmptr, _wpgmptr via corresponding
__p_func() function as now it is provided by every CRT import library
(either directly or manually by mingw-w64 code) which also provides that
symbol.

Declare _environ and _wenviron based on architecture. On i386 and x64 in
msvcr*, and in UCRT on all architectures, it is always defined via
__p__environ() and __p__wenviron() functions which are provided by every
CRT import library (wide variant since VC20+). On arm32 and arm64 in
msvcrt, they are via _get_environ() and _get_wenviron() functions.

_osplatform, _osver, _winver, _winmajor, _winminor are declared as global
variables directly. They are available since the first crtdll.dll library
up to the msvcr80.dll (both i386 and x64). All these variables were removed
in Visual Studio 2008, together with corresponding __p_func fuctions. So
there is no reason to define them via functions.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Pali Rohár 2024-06-07 21:46:12 +02:00 committed by Martin Storsjö
parent 05718c7b43
commit 0988e3267d
1 changed files with 8 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
mingw-w64-headers/crt/stdlib.h
View File

@ -157,18 +157,12 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void);
#define _sys_nerr (*__sys_nerr())
#define _sys_errlist (__sys_errlist())
/* We have a fallback definition of __p___argv and __p__fmode for
msvcrt versions that lack it. */
_CRTIMP char ***__cdecl __p___argv(void);
_CRTIMP int *__cdecl __p__fmode(void);
#if (defined(_X86_) && !defined(__x86_64)) || defined(_UCRT)
_CRTIMP int *__cdecl __p___argc(void);
_CRTIMP wchar_t ***__cdecl __p___wargv(void);
_CRTIMP char ***__cdecl __p__environ(void);
_CRTIMP wchar_t ***__cdecl __p__wenviron(void);
_CRTIMP char **__cdecl __p__pgmptr(void);
_CRTIMP wchar_t **__cdecl __p__wpgmptr(void);
#endif
errno_t __cdecl _get_pgmptr(char **_Value);
errno_t __cdecl _get_wpgmptr(wchar_t **_Value);
@ -179,57 +173,6 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void);
#define _fmode (* __p__fmode())
#endif
#ifdef _MSVCRT_
#ifndef __argc
extern int __argc;
#endif
#ifndef __argv
extern char **__argv;
#endif
#ifndef __wargv
extern wchar_t **__wargv;
#endif
#ifndef _POSIX_
#ifndef _environ
extern char **_environ;
#endif
#ifndef _wenviron
extern wchar_t **_wenviron;
#endif
#endif /* !_POSIX_ */
#ifndef _pgmptr
extern char *_pgmptr;
#endif
#ifndef _wpgmptr
extern wchar_t *_wpgmptr;
#endif
#ifndef _osplatform
extern unsigned int _osplatform;
#endif
#ifndef _osver
extern unsigned int _osver;
#endif
#ifndef _winver
extern unsigned int _winver;
#endif
#ifndef _winmajor
extern unsigned int _winmajor;
#endif
#ifndef _winminor
extern unsigned int _winminor;
#endif
#elif defined(_UCRT)
#ifndef __argc
#define __argc (* __p___argc())
#endif
@ -240,16 +183,6 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void);
#define __wargv (* __p___wargv())
#endif
#ifndef _POSIX_
#ifndef _environ
#define _environ (* __p__environ())
#endif
#ifndef _wenviron
#define _wenviron (* __p__wenviron())
#endif
#endif /* !_POSIX_ */
#ifndef _pgmptr
#define _pgmptr (* __p__pgmptr())
#endif
@ -258,23 +191,8 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void);
#define _wpgmptr (* __p__wpgmptr())
#endif
#else /* _UCRT */
#ifndef __argc
extern int * __MINGW_IMP_SYMBOL(__argc);
#define __argc (* __MINGW_IMP_SYMBOL(__argc))
#endif
#ifndef __argv
extern char *** __MINGW_IMP_SYMBOL(__argv);
#define __argv (* __p___argv())
#endif
#ifndef __wargv
extern wchar_t *** __MINGW_IMP_SYMBOL(__wargv);
#define __wargv (* __MINGW_IMP_SYMBOL(__wargv))
#endif
#ifndef _POSIX_
#if (defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__))
#if (defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || defined(__aarch64__)) && !defined(_UCRT)
/* The plain msvcrt.dll for arm/aarch64 (and msvcr120_app.dll for arm) lacks
* _environ/_wenviron, but has these functions instead. */
_CRTIMP void __cdecl _get_environ(char ***);
@ -299,29 +217,20 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void);
#ifndef _wenviron
#define _wenviron (__get_wenviron_ptr())
#endif
#else /* ARM/ARM64 */
#else /* UCRT or non-ARM/ARM64 msvcrt */
_CRTIMP char ***__cdecl __p__environ(void);
_CRTIMP wchar_t ***__cdecl __p__wenviron(void);
#ifndef _environ
extern char *** __MINGW_IMP_SYMBOL(_environ);
#define _environ (* __MINGW_IMP_SYMBOL(_environ))
#define _environ (* __p__environ())
#endif
#ifndef _wenviron
extern wchar_t *** __MINGW_IMP_SYMBOL(_wenviron);
#define _wenviron (* __MINGW_IMP_SYMBOL(_wenviron))
#define _wenviron (* __p__wenviron())
#endif
#endif
#endif /* !ARM/ARM64 */
#endif /* !_POSIX_ */
#ifndef _pgmptr
extern char ** __MINGW_IMP_SYMBOL(_pgmptr);
#define _pgmptr (* __MINGW_IMP_SYMBOL(_pgmptr))
#endif
#ifndef _wpgmptr
extern wchar_t ** __MINGW_IMP_SYMBOL(_wpgmptr);
#define _wpgmptr (* __MINGW_IMP_SYMBOL(_wpgmptr))
#endif
#ifndef _osplatform
extern unsigned int * __MINGW_IMP_SYMBOL(_osplatform);
#define _osplatform (* __MINGW_IMP_SYMBOL(_osplatform))
@ -347,8 +256,6 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void);
#define _winminor (* __MINGW_IMP_SYMBOL(_winminor))
#endif
#endif /* !_MSVCRT_ && !_UCRT */
errno_t __cdecl _get_osplatform(unsigned int *_Value);
errno_t __cdecl _get_osver(unsigned int *_Value);
errno_t __cdecl _get_winver(unsigned int *_Value);