Changeset b5e68c8 in mainline for boot/generic/include/typedefs.h

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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:

• boot/generic/include/typedefs.h (modified) (2 diffs)

boot/generic/include/typedefs.h

@@ -37 +37 @@
 #include <arch/types.h>
 
-#define NULL  0
+#define NULL  ((void *) 0)
 
 #define false  0
@@ -43 +43 @@
 
 typedef uint8_t bool;
-typedef int32_t wchar_t;
 
 #endif