From 18b7a966e4b104d6c85b2d0ebe912fb01a1d0f75 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 16 Jul 2009 13:37:59 -0700 Subject: [PATCH] Minor build fixes from asm-generic change. - Drop _NOTE(CONSTCOND) usage in libspl this is Solaris specific. - Resolve conflicting OR and AND long prototypes. --- lib/libspl/asm-generic/atomic.c | 2 -- lib/libspl/include/assert.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/libspl/asm-generic/atomic.c b/lib/libspl/asm-generic/atomic.c index ba9ddac397..de4430f9f3 100644 --- a/lib/libspl/asm-generic/atomic.c +++ b/lib/libspl/asm-generic/atomic.c @@ -111,7 +111,6 @@ void atomic_add_ptr(volatile void *target, ssize_t bits) VERIFY3S(pthread_mutex_unlock(&atomic_lock), ==, 0); \ } -ATOMIC_OR(long, ulong_t) ATOMIC_OR(8, uint8_t) ATOMIC_OR(uchar, uchar_t) ATOMIC_OR(16, uint16_t) @@ -130,7 +129,6 @@ ATOMIC_OR(64, uint64_t) VERIFY3S(pthread_mutex_unlock(&atomic_lock), ==, 0); \ } -ATOMIC_AND(long, ulong_t) ATOMIC_AND(8, uint8_t) ATOMIC_AND(uchar, uchar_t) ATOMIC_AND(16, uint16_t) diff --git a/lib/libspl/include/assert.h b/lib/libspl/include/assert.h index ae8ecf4053..7f145b89a3 100644 --- a/lib/libspl/include/assert.h +++ b/lib/libspl/include/assert.h @@ -74,7 +74,7 @@ extern void __assert(const char *, const char *, int); (u_longlong_t)__left, #OP, (u_longlong_t)__right); \ __assert(__buf, __FILE__, __LINE__); \ } \ -_NOTE(CONSTCOND) } while (0) +} while (0) /* END CSTYLED */ #define VERIFY3S(x, y, z) VERIFY3_IMPL(x, y, z, int64_t)