FreeCalypso > hg > fc-selenite
diff src/nucleus/nucleus.h @ 33:b183afa47c72
RiViera/Nucleus typedef conflict resolved
author | Mychaela Falconia <falcon@freecalypso.org> |
---|---|
date | Mon, 16 Jul 2018 06:17:38 +0000 |
parents | 0f80e1e4dce4 |
children |
line wrap: on
line diff
--- a/src/nucleus/nucleus.h Mon Jul 16 05:19:45 2018 +0000 +++ b/src/nucleus/nucleus.h Mon Jul 16 06:17:38 2018 +0000 @@ -135,19 +135,25 @@ typedef int INT; typedef unsigned long * UNSIGNED_PTR; typedef unsigned char * BYTE_PTR; -typedef DATA_ELEMENT BOOLEAN; typedef unsigned int UNSIGNED_INT; #define VOID void #define HUGE #define FAR -typedef char INT8; -typedef unsigned char UINT8; -typedef signed short INT16; -typedef unsigned short UINT16; -typedef signed long INT32; -typedef unsigned long UINT32; +/* + * If general.h file has been already included, then + * do not define the following types + */ +#ifndef GENERAL_H +typedef DATA_ELEMENT BOOLEAN; +typedef signed char INT8; +typedef unsigned char UINT8; +typedef short INT16; +typedef unsigned short UINT16; +typedef int INT32; +typedef unsigned long UINT32; +#endif /* Define register defines. R1, R2, R3, and R4 are used in the Nucleus PLUS