FreeCalypso > hg > fc-selenite
comparison 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 |
comparison
equal
deleted
inserted
replaced
32:b6c8dd9a1b02 | 33:b183afa47c72 |
---|---|
133 typedef unsigned char UNSIGNED_CHAR; | 133 typedef unsigned char UNSIGNED_CHAR; |
134 typedef char CHAR; | 134 typedef char CHAR; |
135 typedef int INT; | 135 typedef int INT; |
136 typedef unsigned long * UNSIGNED_PTR; | 136 typedef unsigned long * UNSIGNED_PTR; |
137 typedef unsigned char * BYTE_PTR; | 137 typedef unsigned char * BYTE_PTR; |
138 typedef DATA_ELEMENT BOOLEAN; | |
139 typedef unsigned int UNSIGNED_INT; | 138 typedef unsigned int UNSIGNED_INT; |
140 | 139 |
141 #define VOID void | 140 #define VOID void |
142 #define HUGE | 141 #define HUGE |
143 #define FAR | 142 #define FAR |
144 | 143 |
145 typedef char INT8; | 144 /* |
146 typedef unsigned char UINT8; | 145 * If general.h file has been already included, then |
147 typedef signed short INT16; | 146 * do not define the following types |
148 typedef unsigned short UINT16; | 147 */ |
149 typedef signed long INT32; | 148 #ifndef GENERAL_H |
150 typedef unsigned long UINT32; | 149 typedef DATA_ELEMENT BOOLEAN; |
150 typedef signed char INT8; | |
151 typedef unsigned char UINT8; | |
152 typedef short INT16; | |
153 typedef unsigned short UINT16; | |
154 typedef int INT32; | |
155 typedef unsigned long UINT32; | |
156 #endif | |
151 | 157 |
152 | 158 |
153 /* Define register defines. R1, R2, R3, and R4 are used in the Nucleus PLUS | 159 /* Define register defines. R1, R2, R3, and R4 are used in the Nucleus PLUS |
154 source code in front of variables that are referenced often. In some | 160 source code in front of variables that are referenced often. In some |
155 ports, defining them as "register" will improve performance. */ | 161 ports, defining them as "register" will improve performance. */ |