From 504447b3ca1da49c197b211d68a7a73ebb048944 Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Tue, 3 Feb 2004 11:19:57 +0000 Subject: [PATCH] -nostdlib didn't link even with startfiles, which we needs for initialize_before() & co. Soften to -nodefaultlibs link flag, so, which should have been in first place... git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6487 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/network/libnet/Jamfile | 2 +- src/kits/network/libnet/compat.c | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/kits/network/libnet/Jamfile b/src/kits/network/libnet/Jamfile index c435dc5f44..19ceb09ca3 100644 --- a/src/kits/network/libnet/Jamfile +++ b/src/kits/network/libnet/Jamfile @@ -4,7 +4,7 @@ UsePrivateHeaders net ; { # Default libs include BeOS R5 libnet.so, something we don't want here! -LINKFLAGS on libnet.so = [ on libnet.so return $(LINKFLAGS) ] -nostdlib ; +LINKFLAGS on libnet.so = [ on libnet.so return $(LINKFLAGS) ] -nodefaultlibs ; } Depends libnet.so : install_network_etc_files ; diff --git a/src/kits/network/libnet/compat.c b/src/kits/network/libnet/compat.c index c983687bad..adf9f379ae 100644 --- a/src/kits/network/libnet/compat.c +++ b/src/kits/network/libnet/compat.c @@ -29,22 +29,9 @@ int _socket_interrupt(void); int _netconfig_find(void); -/* These should probably be moved to a seperate file as they - * are unique to the library as a whole... - */ - -_EXPORT void _init() -{ - h_errno_tls = tls_allocate(); -} - -_EXPORT void _fini() -{ -} - - _EXPORT void initialize_before(void) { + h_errno_tls = tls_allocate(); } _EXPORT void terminate_after(void)