Changeset bfd7aac in mainline for uspace/lib/libc/include

Timestamp:

2010-02-17T19:19:08Z (16 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

1e2e0c1e

Parents:

01a9ef5 (diff), b8da2a3 (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.

Location:

uspace/lib/libc/include

Files:

• atomicdflt.h (modified) (1 diff)
• stacktrace.h (modified) (1 diff)

uspace/lib/libc/include/atomicdflt.h

@@ -56 +56 @@
 }
 
-#ifndef CAS 
+#ifndef CAS
 static inline bool cas(atomic_t *val, long ov, long nv)
 {

uspace/lib/libc/include/stacktrace.h

@@ -57 +57 @@
 extern void stacktrace_prepare(void);
 extern uintptr_t stacktrace_fp_get(void);
-extern uintptr_t stacktrace_pc_get();
+extern uintptr_t stacktrace_pc_get(void);
 
 #endif