--- a/nuc-fw/nucleus/nucleus.h	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/nucleus/nucleus.h	Wed Oct 30 23:19:21 2013 +0000
@@ -135,20 +135,22 @@
 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;
-
+/* need to avoid conflict with Riviera - do what the LoCosto src does */
+#ifndef GENERAL_H
+typedef DATA_ELEMENT	BOOLEAN;
+typedef char		INT8;  
+typedef unsigned char	UINT8; 
+typedef signed short	INT16; 
+typedef unsigned short	UINT16;
+typedef signed long	INT32; 
+typedef unsigned long	UINT32;
+#endif
 
 /* Define register defines.  R1, R2, R3, and R4 are used in the Nucleus PLUS
    source code in front of variables that are referenced often.  In some