Changeset 95c675b in mainline for kernel/generic/include/typedefs.h

Timestamp:

2017-10-17T13:11:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

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

kernel/generic/include/typedefs.h

@@ -39 +39 @@
 #include <arch/common.h>
 #include <arch/types.h>
-#include <abi/bool.h>
-
-#define NULL  ((void *) 0)
-
-#define false  0
-#define true   1
 
 typedef struct {
@@ -55 +49 @@
 
 typedef int32_t inr_t;
-typedef int32_t devno_t;
 
 typedef volatile uint8_t ioport8_t;
 typedef volatile uint16_t ioport16_t;
 typedef volatile uint32_t ioport32_t;
-
-typedef native_t ptrdiff_t;
 
 #ifdef __32_BITS__