From 77f5125586b0c77904ae85a1c4d93e4273f7545a Mon Sep 17 00:00:00 2001 From: X512 Date: Sun, 22 Mar 2020 11:16:50 +0900 Subject: [PATCH] Fix double extern "C" pointed by clang. Change-Id: Ie595dd99d01149868a4f60354ef89fa861cf856b Reviewed-on: https://review.haiku-os.org/c/haiku/+/2389 Reviewed-by: waddlesplash --- src/system/libroot/posix/wchar/mbrtowc.cpp | 1 - src/system/libroot/posix/wchar/mbsrtowcs.cpp | 2 -- src/system/libroot/posix/wchar/wcrtomb.cpp | 1 - src/system/libroot/posix/wchar/wcscoll.cpp | 1 - src/system/libroot/posix/wchar/wcsrtombs.cpp | 2 -- src/system/libroot/posix/wchar/wcsxfrm.cpp | 1 - 6 files changed, 8 deletions(-) diff --git a/src/system/libroot/posix/wchar/mbrtowc.cpp b/src/system/libroot/posix/wchar/mbrtowc.cpp index ceabba6e88..38ee8a0529 100644 --- a/src/system/libroot/posix/wchar/mbrtowc.cpp +++ b/src/system/libroot/posix/wchar/mbrtowc.cpp @@ -85,5 +85,4 @@ __mbrtowc(wchar_t* pwc, const char* s, size_t n, mbstate_t* ps) } -extern "C" B_DEFINE_WEAK_ALIAS(__mbrtowc, mbrtowc); diff --git a/src/system/libroot/posix/wchar/mbsrtowcs.cpp b/src/system/libroot/posix/wchar/mbsrtowcs.cpp index e5500c7ab7..7776be27a8 100644 --- a/src/system/libroot/posix/wchar/mbsrtowcs.cpp +++ b/src/system/libroot/posix/wchar/mbsrtowcs.cpp @@ -101,7 +101,6 @@ __mbsnrtowcs(wchar_t* dst, const char** src, size_t nmc, size_t len, } -extern "C" B_DEFINE_WEAK_ALIAS(__mbsnrtowcs, mbsnrtowcs); @@ -119,5 +118,4 @@ __mbsrtowcs(wchar_t* dst, const char** src, size_t len, mbstate_t* ps) } -extern "C" B_DEFINE_WEAK_ALIAS(__mbsrtowcs, mbsrtowcs); diff --git a/src/system/libroot/posix/wchar/wcrtomb.cpp b/src/system/libroot/posix/wchar/wcrtomb.cpp index f1a80fd5de..828535169f 100644 --- a/src/system/libroot/posix/wchar/wcrtomb.cpp +++ b/src/system/libroot/posix/wchar/wcrtomb.cpp @@ -75,5 +75,4 @@ __wcrtomb(char* s, wchar_t wc, mbstate_t* ps) } -extern "C" B_DEFINE_WEAK_ALIAS(__wcrtomb, wcrtomb); diff --git a/src/system/libroot/posix/wchar/wcscoll.cpp b/src/system/libroot/posix/wchar/wcscoll.cpp index c3f41f1485..d06ffcb0bc 100644 --- a/src/system/libroot/posix/wchar/wcscoll.cpp +++ b/src/system/libroot/posix/wchar/wcscoll.cpp @@ -28,5 +28,4 @@ __wcscoll(const wchar_t* wcs1, const wchar_t* wcs2) } -extern "C" B_DEFINE_WEAK_ALIAS(__wcscoll, wcscoll); diff --git a/src/system/libroot/posix/wchar/wcsrtombs.cpp b/src/system/libroot/posix/wchar/wcsrtombs.cpp index 28baf66691..9d6b3cc455 100644 --- a/src/system/libroot/posix/wchar/wcsrtombs.cpp +++ b/src/system/libroot/posix/wchar/wcsrtombs.cpp @@ -102,7 +102,6 @@ __wcsnrtombs(char* dst, const wchar_t** src, size_t nwc, size_t len, } -extern "C" B_DEFINE_WEAK_ALIAS(__wcsnrtombs, wcsnrtombs); @@ -118,5 +117,4 @@ __wcsrtombs(char* dst, const wchar_t** src, size_t len, mbstate_t* ps) } -extern "C" B_DEFINE_WEAK_ALIAS(__wcsrtombs, wcsrtombs); diff --git a/src/system/libroot/posix/wchar/wcsxfrm.cpp b/src/system/libroot/posix/wchar/wcsxfrm.cpp index 5843349fe5..4260703d32 100644 --- a/src/system/libroot/posix/wchar/wcsxfrm.cpp +++ b/src/system/libroot/posix/wchar/wcsxfrm.cpp @@ -30,5 +30,4 @@ __wcsxfrm(wchar_t* dest, const wchar_t* src, size_t destSize) } -extern "C" B_DEFINE_WEAK_ALIAS(__wcsxfrm, wcsxfrm);