diff options
-rwxr-xr-x | apps/app_sms.c | 2 | ||||
-rwxr-xr-x | codecs/ilbc/Makefile | 4 | ||||
-rwxr-xr-x | db1-ast/btree/bt_debug.c | 2 | ||||
-rwxr-xr-x | db1-ast/mpool/mpool.c | 4 | ||||
-rwxr-xr-x | utils.c | 5 |
5 files changed, 11 insertions, 6 deletions
diff --git a/apps/app_sms.c b/apps/app_sms.c index dc7c14aca..77fecd4ef 100755 --- 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 12471d105..04b912dbe 100755 --- 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 3aefbe762..443f2bf99 100755 --- 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 6773e4e23..eca24e518 100755 --- 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 @@ -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++; |