[PATCH 05/10] msvcrt: Remove MSVCRT_ prefix from exit.c functions.
Alexandre Julliard
julliard at winehq.org
Wed Dec 2 08:57:01 CST 2020
Piotr Caban <piotr at codeweavers.com> writes:
> Signed-off-by: Piotr Caban <piotr at codeweavers.com>
> ---
> dlls/crtdll/crtdll.spec | 16 +++++-----
> dlls/msvcr100/msvcr100.spec | 22 +++++++-------
> dlls/msvcr110/msvcr110.spec | 24 +++++++--------
> dlls/msvcr120/msvcr120.spec | 26 ++++++++--------
> dlls/msvcr70/msvcr70.spec | 18 +++++------
> dlls/msvcr71/msvcr71.spec | 18 +++++------
> dlls/msvcr80/msvcr80.spec | 22 +++++++-------
> dlls/msvcr90/msvcr90.spec | 22 +++++++-------
> dlls/msvcrt/cpp.c | 2 +-
> dlls/msvcrt/errno.c | 2 +-
> dlls/msvcrt/except.c | 6 ++--
> dlls/msvcrt/exit.c | 46 ++++++++++++++--------------
> dlls/msvcrt/locale.c | 10 +++----
> dlls/msvcrt/msvcrt.h | 2 --
> dlls/msvcrt/msvcrt.spec | 20 ++++++-------
> dlls/msvcrt/process.c | 2 +-
> dlls/msvcrtd/msvcrtd.spec | 18 +++++------
> dlls/ucrtbase/ucrtbase.spec | 60 ++++++++++++++++++-------------------
> 18 files changed, 167 insertions(+), 169 deletions(-)
I'll commit it, but I reverted the atexit() bit since it's causing
trouble on Android:
arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: error: dlls/crtdll/exit.o: multiple definition of 'atexit'
arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: /home/julliard/android/android-ndk-r21/toolchains/llvm/prebuilt/linux-x86_64/bin/../sysroot/usr/lib/arm-linux-androideabi/29/crtbegin_so.o: previous definition here
--
Alexandre Julliard
julliard at winehq.org
More information about the wine-devel
mailing list