Changeset 7329e6a in mainline for kernel/arch/ia64/include/types.h

Timestamp:

2010-11-29T19:22:58Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5581b469

Parents:

3a4b3ba (diff), 41a7f62 (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:

• kernel/arch/ia64/include/types.h (modified) (1 diff)

kernel/arch/ia64/include/types.h

@@ -52 +52 @@
 } __attribute__((may_alias)) fncptr_t;
 
-#define PRIp   PRIx64  /**< Format for uintptr_t. */
-#define PRIs   PRIu64  /**< Format for size_t. */
+#define INTN_C(c)   INT64_C(c)
+#define UINTN_C(c)  UINT64_C(c)
+
 #define PRIdn  PRId64  /**< Format for native_t. */
 #define PRIun  PRIu64  /**< Format for unative_t. */
 #define PRIxn  PRIx64  /**< Format for hexadecimal unative_t. */
+#define PRIua  PRIu64  /**< Format for atomic_count_t. */
 
 #endif