libtransport.git Changeset - c63df9499f11

Changeset - c63df9499f11

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Jan Kaluza - 13 years ago 2012-10-09 10:01:51
hanzz.k@gmail.com

Do not include malloc.h on BSD

3 files changed with 8 insertions and 0 deletions:

backends/skype/main.cpp

backends/swiften/main.cpp

spectrum/src/main.cpp

0 comments (0 inline, 0 general)

backends/skype/main.cpp

➞

Show inline comments

@@ @@ -16,13 +16,15 @@ @@
 #include "transport/networkplugin.h"
 #include "transport/logger.h"
 #include <boost/filesystem.hpp>
 #include "sys/wait.h"
 #include "sys/signal.h"
 // #include "valgrind/memcheck.h"
 #ifndef __FreeBSD__
 #include "malloc.h"
 #endif
 #include <dbus-1.0/dbus/dbus-glib-lowlevel.h>
 DEFINE_LOGGER(logger, "backend");
 using namespace Transport;

backends/swiften/main.cpp

➞

Show inline comments

@@ @@ -11,14 +11,16 @@ @@
 #include "unistd.h"
 #include "signal.h"
 #include "sys/wait.h"
 #include "sys/signal.h"
 #endif
 #ifndef __FreeBSD__
 // malloc_trim
 #include "malloc.h"
 #endif
 // Boost
 #include <boost/algorithm/string.hpp>
 using namespace boost::filesystem;
 using namespace boost::program_options;
 using namespace Transport;
@@ @@ -103,14 +105,16 @@ class SwiftenPlugin : public NetworkPlugin { @@
 				client->onDisconnected.disconnect(boost::bind(&SwiftenPlugin::handleSwiftDisconnected, this, user, _1));
 				client->onMessageReceived.disconnect(boost::bind(&SwiftenPlugin::handleSwiftMessageReceived, this, user, _1));
 				m_users.erase(user);
+			}
 #ifndef WIN32
 #ifndef __FreeBSD__
 			// force returning of memory chunks allocated by libxml2 to kernel
 			malloc_trim(0);
 #endif
 #endif
+		}
 		void handleSwiftConnected(const std::string &user) {
 			LOG4CXX_INFO(logger, user << ": Connected to XMPP server.");
 			handleConnected(user);

spectrum/src/main.cpp

➞

Show inline comments

@@ @@ -23,13 +23,15 @@ @@
 #ifndef WIN32
 #include "sys/signal.h"
 #include <pwd.h>
 #include <grp.h>
 #include <sys/resource.h>
 #include "libgen.h"
 #ifndef __FreeBSD__
 #include <malloc.h>
 #endif
 #else
 #include <process.h>
 #define getpid _getpid
 // #include "win32/SpectrumService.h"
 #endif
 #include <sys/stat.h>

0 comments (0 inline, 0 general)