From 79ff2e46d05773bed67a3cbaf457bc3580e72b2f Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Thu, 4 Oct 2012 10:09:34 +0200 Subject: [PATCH] Do not use malloc_trim on BSd --- backends/libpurple/main.cpp | 4 ++++ src/usermanager.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/backends/libpurple/main.cpp b/backends/libpurple/main.cpp index 0a487ea3..a337bcb4 100644 --- a/backends/libpurple/main.cpp +++ b/backends/libpurple/main.cpp @@ -17,7 +17,9 @@ #include "geventloop.h" // #include "valgrind/memcheck.h" +#ifndef BSD #include "malloc.h" +#endif #include #include "errno.h" #include @@ -364,8 +366,10 @@ class SpectrumNetworkPlugin : public NetworkPlugin { purple_accounts_delete_wrapped(account); #ifndef WIN32 +#ifndef BSD malloc_trim(0); #endif +#endif // VALGRIND_DO_LEAK_CHECK; } } diff --git a/src/usermanager.cpp b/src/usermanager.cpp index 4342a214..11ec7296 100644 --- a/src/usermanager.cpp +++ b/src/usermanager.cpp @@ -31,7 +31,9 @@ #include "Swiften/Swiften.h" #include "Swiften/Server/ServerStanzaChannel.h" #include "Swiften/Elements/StreamError.h" +#ifndef BSD #include "malloc.h" +#endif // #include "valgrind/memcheck.h" namespace Transport { @@ -124,8 +126,10 @@ void UserManager::removeUser(User *user, bool onUserBehalf) { onUserDestroyed(user); delete user; #ifndef WIN32 +#ifndef BSD malloc_trim(0); #endif +#endif // VALGRIND_DO_LEAK_CHECK; }