FreeCalypso > hg > fc-selenite

diff 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
line wrap: on
line diff
--- a/src/cs/riviera/rv/general.h	Mon Jul 16 05:19:45 2018 +0000
+++ b/src/cs/riviera/rv/general.h	Mon Jul 16 06:17:38 2018 +0000
@@ -37,7 +37,9 @@
 /* BOARD */
 #else
    #ifndef __TYPEDEFS_H__ /* This #define allows to Condat to use general.h without conflict */
-      typedef unsigned short  UINT16;
+      #ifndef NUCLEUS
+         typedef unsigned short  UINT16;
+      #endif
       typedef unsigned char   UBYTE;
       typedef short           SHORT;
       typedef signed char     BYTE;
@@ -48,14 +50,18 @@
       typedef unsigned short  USHORT;
       typedef unsigned int    ULONG;
    #endif
-   typedef unsigned long    UINT32;
+   #ifndef NUCLEUS
+      typedef unsigned long    UINT32;
+   #endif
 #endif
 
+#ifndef NUCLEUS
 typedef unsigned char   UINT8;
 typedef signed char     INT8;
 typedef short           INT16; 
 typedef int             INT32;
 typedef unsigned char   BOOLEAN;
+#endif
 
 typedef void (*FUNC)(void);      /* pointer to a function */