FreeCalypso > hg > fc-selenite

comparison src/cs/riviera/rv/general.h @ 33:b183afa47c72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
RiViera/Nucleus typedef conflict resolved
author Mychaela Falconia <falcon@freecalypso.org>
date Mon, 16 Jul 2018 06:17:38 +0000
parents b6a5e36de839
children
comparison
equal deleted inserted replaced
32:b6c8dd9a1b02 33:b183afa47c72
35 typedef int BOOL; 35 typedef int BOOL;
36 36
37 /* BOARD */ 37 /* BOARD */
38 #else 38 #else
39 #ifndef __TYPEDEFS_H__ /* This #define allows to Condat to use general.h without conflict */ 39 #ifndef __TYPEDEFS_H__ /* This #define allows to Condat to use general.h without conflict */
40 typedef unsigned short UINT16; 40 #ifndef NUCLEUS
41 typedef unsigned short UINT16;
42 #endif
41 typedef unsigned char UBYTE; 43 typedef unsigned char UBYTE;
42 typedef short SHORT; 44 typedef short SHORT;
43 typedef signed char BYTE; 45 typedef signed char BYTE;
44 #if !defined (BOOL_FLAG) 46 #if !defined (BOOL_FLAG)
45 #define BOOL_FLAG 47 #define BOOL_FLAG
46 typedef unsigned char BOOL; 48 typedef unsigned char BOOL;
47 #endif 49 #endif
48 typedef unsigned short USHORT; 50 typedef unsigned short USHORT;
49 typedef unsigned int ULONG; 51 typedef unsigned int ULONG;
50 #endif 52 #endif
51 typedef unsigned long UINT32; 53 #ifndef NUCLEUS
54 typedef unsigned long UINT32;
55 #endif
52 #endif 56 #endif
53 57
58 #ifndef NUCLEUS
54 typedef unsigned char UINT8; 59 typedef unsigned char UINT8;
55 typedef signed char INT8; 60 typedef signed char INT8;
56 typedef short INT16; 61 typedef short INT16;
57 typedef int INT32; 62 typedef int INT32;
58 typedef unsigned char BOOLEAN; 63 typedef unsigned char BOOLEAN;
64 #endif
59 65
60 typedef void (*FUNC)(void); /* pointer to a function */ 66 typedef void (*FUNC)(void); /* pointer to a function */
61 67
62 #define OK 1 68 #define OK 1
63 69