Changeset 7f1c620 in mainline for generic/include/macros.h

Timestamp:

2006-07-04T17:17:56Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0ffa3ef5

Parents:

991779c5

Message:

Replace old u?? types with respective C99 variants (e.g. uint32_t, int64_t, uintptr_t etc.).

File:

• generic/include/macros.h (modified) (1 diff)

generic/include/macros.h

@@ -47 +47 @@
 
 /** Return true if the interlvals overlap. */
-static inline int overlaps(__address s1, size_t sz1, __address s2, size_t sz2)
+static inline int overlaps(uintptr_t s1, size_t sz1, uintptr_t s2, size_t sz2)
 {
-        __address e1 = s1+sz1;
-        __address e2 = s2+sz2;
+        uintptr_t e1 = s1+sz1;
+        uintptr_t e2 = s2+sz2;
 
         return s1 < e2 && s2 < e1;