Changeset 0b9ac3c in mainline for uspace/lib/libc/include/atomicdflt.h

Timestamp:

2010-02-23T19:03:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/libc/include/atomicdflt.h (modified) (1 diff)

uspace/lib/libc/include/atomicdflt.h

@@ -37 +37 @@
 
 #ifndef LIBC_ARCH_ATOMIC_H_
-#error This file cannot be included directly, include atomic.h instead.
+        #error This file cannot be included directly, include atomic.h instead.
 #endif
 
+#include <stdint.h>
 #include <bool.h>
 
 typedef struct atomic {
-        volatile long count;
+        volatile atomic_count_t count;
 } atomic_t;
 
-static inline void atomic_set(atomic_t *val, long i)
+static inline void atomic_set(atomic_t *val, atomic_count_t i)
 {
-        val->count = i;
+        val->count = i;
 }
 
-static inline long atomic_get(atomic_t *val)
+static inline atomic_count_t atomic_get(atomic_t *val)
 {
-        return val->count;
+        return val->count;
 }
 
-#ifndef CAS 
-static inline bool cas(atomic_t *val, long ov, long nv)
+#ifndef CAS
+static inline bool cas(atomic_t *val, atomic_count_t ov, atomic_count_t nv)
 {
         return __sync_bool_compare_and_swap(&val->count, ov, nv);