Changeset 7329e6a in mainline for kernel/generic/include/typedefs.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/generic/include/typedefs.h (modified) (2 diffs)

kernel/generic/include/typedefs.h

@@ -40 +40 @@
 #include <arch/types.h>
 
-#define NULL    ((void *) 0)
+#define NULL  ((void *) 0)
 
 #define false  0
@@ -69 +69 @@
 typedef int32_t devno_t;
 
-typedef int32_t wchar_t;
-
 typedef volatile uint8_t ioport8_t;
 typedef volatile uint16_t ioport16_t;