Merge OSX compatibility patch (bug #1940)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3331 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_sms.c b/apps/app_sms.c
index dc7c14aca34d8448f015e1afe3e3fce0ca66279c..77fecd4ef1eb555b9ad95589e117883c806dd28d 100755 (executable)
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -203,7 +203,7 @@ static void
 packdate (unsigned char *o, time_t w)
 {
   struct tm *t = localtime (&w);
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
   int z = - t->tm_gmtoff / 3600 / 15;
 #else
   int z = timezone / 3600 / 15;

diff --git a/codecs/ilbc/Makefile b/codecs/ilbc/Makefile
index 12471d1051eec0a5d90238766845445ad7a486d8..04b912dbe540528e37a292e188d2170a9aa79a22 100755 (executable)
--- a/codecs/ilbc/Makefile
+++ b/codecs/ilbc/Makefile
@@ -1,5 +1,9 @@
 ARCH=$(PROC)
+ifeq (${OSARCH},Darwin)
+CFLAGS+=-Wall -Werror -fPIC -O3 -funroll-loops -fomit-frame-pointer
+else
 CFLAGS+=-Wall -Werror -fPIC -O3 -march=$(ARCH) -funroll-loops -fomit-frame-pointer
+endif
 LIB=libilbc.a
 
 OBJS= anaFilter.o iCBSearch.o packing.o \

diff --git a/db1-ast/btree/bt_debug.c b/db1-ast/btree/bt_debug.c
index 3aefbe76224498e1fb45bb097db11b955fa58b91..443f2bf99e1a101ef8957feb1bc7358860874899 100755 (executable)
--- a/db1-ast/btree/bt_debug.c
+++ b/db1-ast/btree/bt_debug.c
@@ -38,6 +38,7 @@
 static char sccsid[] = "@(#)bt_debug.c 8.5 (Berkeley) 8/17/94";
 #endif /* LIBC_SCCS and not lint */
 
+#ifdef DEBUG
 #include <sys/param.h>
 
 #include <stdio.h>
@@ -47,7 +48,6 @@ static char sccsid[] = "@(#)bt_debug.c        8.5 (Berkeley) 8/17/94";
 #include <db.h>
 #include "btree.h"
 
-#ifdef DEBUG
 /*
  * BT_DUMP -- Dump the tree
  *

diff --git a/db1-ast/mpool/mpool.c b/db1-ast/mpool/mpool.c
index 6773e4e2338fe9a0f64317dfd21862f607e24aed..eca24e518de96b278f4a0869f6c2f9f14c9d3ebf 100755 (executable)
--- a/db1-ast/mpool/mpool.c
+++ b/db1-ast/mpool/mpool.c
@@ -50,6 +50,8 @@ static char sccsid[] = "@(#)mpool.c   8.5 (Berkeley) 7/26/94";
 #define        __MPOOLINTERFACE_PRIVATE
 #include <mpool.h>
 
+#undef __APPLE__
+
 #ifndef __APPLE__
 #define mpool_open __mpool_open
 #define mpool_filter __mpool_filter
@@ -311,6 +313,8 @@ mpool_sync(mp)
        return (fsync(mp->fd) ? RET_ERROR : RET_SUCCESS);
 }
 
+#define __APPLE__
+
 #ifndef __APPLE__
 #undef mpool_open
 #undef mpool_filter

diff --git a/utils.c b/utils.c
index 8d976fee208459d98862f7214cd61e946e316fa2..6052c78554217909cca0813f97c05298eee66821 100755 (executable)
--- a/utils.c
+++ b/utils.c
@@ -18,7 +18,7 @@
 static char base64[64];
 static char b2a[256];
 
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
 
 /* duh? ERANGE value copied from web... */
 #define ERANGE 34
@@ -190,13 +190,11 @@ int test_for_thread_safety(void)
        ast_mutex_lock(&test_lock);
        lock_count += 1;
        pthread_create(&test_thread, NULL, test_thread_body, NULL); 
-       pthread_yield();
        usleep(100);
        if (lock_count != 2) 
                test_errors++;
        ast_mutex_unlock(&test_lock);
        lock_count -= 1;
-       pthread_yield(); 
        usleep(100); 
        if (lock_count != 1) 
                test_errors++;
@@ -205,7 +203,6 @@ int test_for_thread_safety(void)
        if (lock_count != 0) 
                test_errors++;
        ast_mutex_unlock(&test_lock2);
-       pthread_yield();
        usleep(100);
        if (lock_count != 0) 
                test_errors++;