aboutsummaryrefslogtreecommitdiffstats
path: root/include/asterisk
diff options
context:
space:
mode:
authorautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-03-16 16:22:58 +0000
committerautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-03-16 16:22:58 +0000
commit6a2e2824bc81a2dffe13f45d49be462b44517fe4 (patch)
treedbe4146e00c4e6e2ee12147c403bd6c2481d09c7 /include/asterisk
parentb6352a7f7b76fad76bd6246f94cbcd4ebccd1ec1 (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@59007 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
-rw-r--r--include/asterisk/lock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index 67deba4dd..f2ebdabe7 100644
--- a/include/asterisk/lock.h
+++ b/include/asterisk/lock.h
@@ -670,7 +670,7 @@ int ast_atomic_fetchadd_int_slow(volatile int *p, int v);
#include "asterisk/inline_api.h"
-#if defined (__i386__)
+#if defined (__i386__) && !defined(__APPLE__)
AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v),
{
__asm __volatile (