Changeset 0b9ac3c in mainline for uspace/lib/libc/arch/ia64/include/types.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/arch/ia64/include/types.h (modified) (2 diffs)

uspace/lib/libc/arch/ia64/include/types.h

@@ -27 +27 @@
  */
 
-/** @addtogroup libcia64        
+/** @addtogroup libcia64
  * @{
  */
@@ -50 +50 @@
 typedef unsigned long int uint64_t;
 
+typedef struct {
+        uint64_t lo;
+        uint64_t hi;
+} uint128_t;
+
 typedef int64_t ssize_t;
 typedef uint64_t size_t;
 
 typedef uint64_t uintptr_t;
+typedef uint64_t atomic_count_t;
+typedef int64_t atomic_signed_t;
 
-typedef unsigned char __r8;                     /* Reserve byte */
-typedef unsigned short __r16;
-typedef unsigned int __r32;
-typedef unsigned long __r64;
-
-typedef struct __r128{
-        __r64 lo;
-        __r64 hi;
-} __r128;
+typedef struct {
+        uintptr_t fnc;
+        uintptr_t gp;
+} __attribute__((may_alias)) fncptr_t;
 
 #endif