5611037921
hardware support, so it can't replace comms/asterisk. However, apparently there is demand for this version, so wiz@ suggested it be imported here into comms/asterisk16. The latest version is 1.6.1.1, but I won't have time to update all the patches before the freeze. I'll update to that version sometime after the freeze when I get a chance.
49 lines
1.7 KiB
Text
49 lines
1.7 KiB
Text
$NetBSD: patch-at,v 1.1.1.1 2009/06/12 09:04:57 jnemeth Exp $
|
|
|
|
--- utils/extconf.c.orig 2008-12-17 12:59:42.000000000 -0800
|
|
+++ utils/extconf.c
|
|
@@ -789,6 +789,10 @@ static void __attribute__((destructor))
|
|
#include "libkern/OSAtomic.h"
|
|
#endif
|
|
|
|
+#if defined(HAVE_SYS_ATOMIC_H)
|
|
+#include <sys/atomic.h>
|
|
+#endif
|
|
+
|
|
/*! \brief Atomically add v to *p and return * the previous value of *p.
|
|
* This can be used to handle reference counts, and the return value
|
|
* can be used to generate unique identifiers.
|
|
@@ -802,12 +806,18 @@ AST_INLINE_API(int ast_atomic_fetchadd_i
|
|
#elif defined(HAVE_OSX_ATOMICS) && (SIZEOF_INT == 4)
|
|
AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v),
|
|
{
|
|
- return OSAtomicAdd32(v, (int32_t *) p);
|
|
+ return OSAtomicAdd32(v, (int32_t *) p) - v;
|
|
})
|
|
#elif defined(HAVE_OSX_ATOMICS) && (SIZEOF_INT == 8)
|
|
AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v),
|
|
{
|
|
- return OSAtomicAdd64(v, (int64_t *) p);
|
|
+ return OSAtomicAdd64(v, (int64_t *) p) - v;
|
|
+})
|
|
+#elif defined(HAVE_SYS_ATOMIC_H)
|
|
+AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v),
|
|
+{
|
|
+ return atomic_add_int_nv((unsigned int *)p, v) - v;
|
|
+})
|
|
#elif defined (__i386__) || defined(__x86_64__)
|
|
AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v),
|
|
{
|
|
@@ -849,6 +859,12 @@ AST_INLINE_API(int ast_atomic_dec_and_te
|
|
AST_INLINE_API(int ast_atomic_dec_and_test(volatile int *p),
|
|
{
|
|
return OSAtomicAdd64( -1, (int64_t *) p) == 0;
|
|
+})
|
|
+#elif defined(HAVE_SYS_ATOMIC_H)
|
|
+AST_INLINE_API(int ast_atomic_dec_and_test(volatile int *p),
|
|
+{
|
|
+ return atomic_dec_uint_nv((unsigned int *)p) == 0;
|
|
+})
|
|
#else
|
|
AST_INLINE_API(int ast_atomic_dec_and_test(volatile int *p),
|
|
{
|