You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2004/07/13 11:22:41 UTC
cvs commit: apr/include apr_atomic.h
jorton 2004/07/13 02:22:41
Modified: . Tag: APR_0_9_BRANCH CHANGES
include Tag: APR_0_9_BRANCH apr_atomic.h
Log:
* include/apr_atomic.h: Fix FreeBSD atomics.
PR: 26818
Submitted by: Paul Querna <chip force-elite.com>
Revision Changes Path
No revision
No revision
1.426.2.26 +2 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.426.2.25
retrieving revision 1.426.2.26
diff -d -w -u -r1.426.2.25 -r1.426.2.26
--- CHANGES 27 Jun 2004 11:45:11 -0000 1.426.2.25
+++ CHANGES 13 Jul 2004 09:22:40 -0000 1.426.2.26
@@ -1,5 +1,7 @@
Changes with APR 0.9.5
+ *) Fix FreeBSD atomics. [Paul Querna <chip force-elite.com>]
+
*) Fix apr_snprintf() to respect precision for small floating point
numbers. PR 29621. [Artur Zaprzala <zybi talex.pl>]
No revision
No revision
1.48.2.3 +4 -4 apr/include/apr_atomic.h
Index: apr_atomic.h
===================================================================
RCS file: /home/cvs/apr/include/apr_atomic.h,v
retrieving revision 1.48.2.2
retrieving revision 1.48.2.3
diff -d -w -u -r1.48.2.2 -r1.48.2.3
--- apr_atomic.h 13 Feb 2004 09:33:44 -0000 1.48.2.2
+++ apr_atomic.h 13 Jul 2004 09:22:41 -0000 1.48.2.3
@@ -162,10 +162,10 @@
#elif defined(__FreeBSD__)
#define apr_atomic_t apr_uint32_t
-#define apr_atomic_add(mem, val) atomic_add_int(mem,val)
-#define apr_atomic_dec(mem) atomic_subtract_int(mem,1)
-#define apr_atomic_inc(mem) atomic_add_int(mem,1)
-#define apr_atomic_set(mem, val) atomic_set_int(mem, val)
+#define apr_atomic_add(mem, val) (atomic_add_int(mem,val),mem)
+#define apr_atomic_dec(mem) (atomic_subtract_int(mem,1),mem)
+#define apr_atomic_inc(mem) (atomic_add_int(mem,1),mem)
+#define apr_atomic_set(mem, val) (atomic_set_int(mem, val),mem)
#define apr_atomic_read(mem) (*mem)
#elif (defined(__linux__) || defined(__EMX__)) && defined(__i386__) && !APR_FORCE_ATOMIC_GENERIC