libtransport.git Changeset - 719e5d2dc018

Changeset - 719e5d2dc018

Parent rev.

Child rev.

[Not reviewed]

0 5 0

Joel Reymont - 12 years ago 2013-07-10 17:20:59
joelr1@gmail.com

build on the mac

5 files changed with 17 insertions and 5 deletions:

backends/libpurple/main.cpp

backends/libyahoo2/yahoo/crypt.c

backends/libyahoo2/yahoo/libyahoo2.c

backends/libyahoo2/yahoo/yahoo_util.c

backends/libyahoo2/yahoo/yahoo_util.h

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -14,13 +14,13 @@ @@
 #include "transport/logging.h"
 #include "transport/config.h"
 #include "transport/logging.h"
 #include "geventloop.h"
 // #include "valgrind/memcheck.h"
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__APPLE__)
 #include "malloc.h"
 #endif
 #include <algorithm>
 #include "errno.h"
 #include <boost/make_shared.hpp>
@@ @@ -414,13 +414,13 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
 				purple_account_set_enabled_wrapped(account, "spectrum", FALSE);
 				m_accounts.erase(account);
 				purple_accounts_delete_wrapped(account);
 #ifndef WIN32
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__APPLE__)
 				malloc_trim(0);
 #endif
 #endif
 // 				VALGRIND_DO_LEAK_CHECK;
+			}
+		}
@@ @@ -1580,13 +1580,13 @@ static PurpleCoreUiOps coreUiOps = @@
 };
 static void signed_on(PurpleConnection *gc, gpointer unused) {
 	PurpleAccount *account = purple_connection_get_account_wrapped(gc);
 	np->handleConnected(np->m_accounts[account]);
 #ifndef WIN32
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__APPLE__)
 	// force returning of memory chunks allocated by libxml2 to kernel
 	malloc_trim(0);
 #endif
 #endif
 	// For prpl-gg
 		np->readyForData();
+	}
+}
 int main(int argc, char **argv) {
 #ifndef WIN32
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__APPLE__)
 		mallopt(M_CHECK_ACTION, 2);
 		mallopt(M_PERTURB, 0xb);
 #endif
 		signal(SIGPIPE, SIG_IGN);

backends/libyahoo2/yahoo/crypt.c

➞

Show inline comments

@@ @@ -23,12 +23,16 @@ @@
  * freebsd, crypt works properly on those systems. i hate solaris */
 #if HAVE_CONFIG_H
 # include <config.h>
 #endif
 #ifdef __APPLE__
 #define HAVE_STRING_H 1
 #endif
 #if HAVE_STRING_H
 #  include <string.h>
 #elif HAVE_STRINGS_H
 #  include <strings.h>
 #endif

backends/libyahoo2/yahoo/libyahoo2.c

➞

Show inline comments

@@ @@ -48,12 +48,16 @@ @@
  */
 #if HAVE_CONFIG_H
 # include <config.h>
 #endif
 #if __APPLE__
 #define STDC_HEADERS 1
 #endif
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <errno.h>
 #include <stdio.h>
 #include <stdarg.h>

backends/libyahoo2/yahoo/yahoo_util.c

➞

Show inline comments

@@ @@ -20,12 +20,16 @@ @@
  */
 #if HAVE_CONFIG_H
 # include <config.h>
 #endif
 #if __APPLE__
 #define STDC_HEADERS 1
 #endif
 #if STDC_HEADERS
 # include <string.h>
 #else
 # if !HAVE_STRCHR
 #  define strchr index
 #  define strrchr rindex

backends/libyahoo2/yahoo/yahoo_util.h

➞

Show inline comments

@@ @@ -61,13 +61,13 @@ @@
 # define y_renew(type, mem, n)	(type *)realloc(mem, n)
 void *y_memdup(const void *addr, int n);
 char **y_strsplit(char *str, char *sep, int nelem);
 void y_strfreev(char **vector);
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__APPLE__)
 int strncasecmp(const char *s1, const char *s2, size_t n);
 int strcasecmp(const char *s1, const char *s2);
 char *strdup(const char *s);
 int snprintf(char *str, size_t size, const char *format, ...);

0 comments (0 inline, 0 general)