Changeset 46c20c8 in mainline for uspace/lib/c/include/macros.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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/c/include/macros.h (moved) (moved from uspace/lib/libc/include/macros.h ) (1 diff)

uspace/lib/c/include/macros.h

@@ -48 +48 @@
 #define STRING_ARG(arg)  #arg
 
-#define LOWER32(arg)  ((arg) & 0xffffffff)
-#define UPPER32(arg)  (((arg) >> 32) & 0xffffffff)
+#define LOWER32(arg)  (((uint64_t) (arg)) & 0xffffffff)
+#define UPPER32(arg)  (((((uint64_t) arg)) >> 32) & 0xffffffff)
 
 #define MERGE_LOUP32(lo, up) \