Fix duplicate symbol errors

This commit is contained in:
Michael Kolupaev 2024-08-14 03:00:51 +00:00
parent 0dc7cd7eb4
commit 0716b460db

View File

@ -66,13 +66,11 @@ TRAP(gethostbyname)
TRAP(gethostbyname2) TRAP(gethostbyname2)
TRAP(gethostent) TRAP(gethostent)
TRAP(getlogin) TRAP(getlogin)
TRAP(getmntent)
TRAP(getnetbyaddr) TRAP(getnetbyaddr)
TRAP(getnetbyname) TRAP(getnetbyname)
TRAP(getnetent) TRAP(getnetent)
TRAP(getnetgrent) TRAP(getnetgrent)
TRAP(getnetgrent_r) TRAP(getnetgrent_r)
TRAP(getopt)
TRAP(getopt_long) TRAP(getopt_long)
TRAP(getopt_long_only) TRAP(getopt_long_only)
TRAP(getpass) TRAP(getpass)
@ -133,7 +131,6 @@ TRAP(nrand48)
TRAP(__ppc_get_timebase_freq) TRAP(__ppc_get_timebase_freq)
TRAP(ptsname) TRAP(ptsname)
TRAP(putchar_unlocked) TRAP(putchar_unlocked)
TRAP(putenv)
TRAP(pututline) TRAP(pututline)
TRAP(pututxline) TRAP(pututxline)
TRAP(putwchar_unlocked) TRAP(putwchar_unlocked)
@ -148,7 +145,6 @@ TRAP(sethostent)
TRAP(sethostid) TRAP(sethostid)
TRAP(setkey) TRAP(setkey)
//TRAP(setlocale) // Used by replxx at startup //TRAP(setlocale) // Used by replxx at startup
TRAP(setlogmask)
TRAP(setnetent) TRAP(setnetent)
TRAP(setnetgrent) TRAP(setnetgrent)
TRAP(setprotoent) TRAP(setprotoent)
@ -203,7 +199,6 @@ TRAP(lgammal)
TRAP(nftw) TRAP(nftw)
TRAP(nl_langinfo) TRAP(nl_langinfo)
TRAP(putc_unlocked) TRAP(putc_unlocked)
TRAP(rand)
/** In the current POSIX.1 specification (POSIX.1-2008), readdir() is not required to be thread-safe. However, in modern /** In the current POSIX.1 specification (POSIX.1-2008), readdir() is not required to be thread-safe. However, in modern
* implementations (including the glibc implementation), concurrent calls to readdir() that specify different directory streams * implementations (including the glibc implementation), concurrent calls to readdir() that specify different directory streams
* are thread-safe. In cases where multiple threads must read from the same directory stream, using readdir() with external * are thread-safe. In cases where multiple threads must read from the same directory stream, using readdir() with external
@ -288,4 +283,14 @@ TRAP(tss_get)
TRAP(tss_set) TRAP(tss_set)
TRAP(tss_delete) TRAP(tss_delete)
#ifndef USE_MUSL
/// These produce duplicate symbol errors when statically linking with musl.
/// Maybe we can remove them from the musl fork.
TRAP(getopt)
TRAP(putenv)
TRAP(setlogmask)
TRAP(rand)
TRAP(getmntent)
#endif
#endif #endif