fix basic types redefinition

diff --git a/lib/common/mem.h b/lib/common/mem.h
index 32c63dd1763c17819eae402fe9691b7bfe383d05..fb73ef0938578df7d7e4d4b873587fb1dd5b7c66 100644 (file)
--- a/lib/common/mem.h
+++ b/lib/common/mem.h
@@ -46,6 +46,8 @@ MEM_STATIC void MEM_check(void) { MEM_STATIC_ASSERT((sizeof(size_t)==4) || (size
 /*-**************************************************************
 *  Basic Types
 *****************************************************************/
+#ifndef BASIC_TYPES_DEFINED
+#define BASIC_TYPES_DEFINED
 #if  !defined (__VMS) && (defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
 # include <stdint.h>
   typedef  uint8_t BYTE;
@@ -66,6 +68,7 @@ MEM_STATIC void MEM_check(void) { MEM_STATIC_ASSERT((sizeof(size_t)==4) || (size
   typedef   signed long long  S64;
   typedef ptrdiff_t      iPtrDiff;
 #endif
+#endif
 
 
 /*-**************************************************************

diff --git a/programs/util.h b/programs/util.h
index 3e8aaf5d6c86338c7f7147aa28b0735818c015d0..409f6d7c1cb6dcbecd639082dc3402e9282952d3 100644 (file)
--- a/programs/util.h
+++ b/programs/util.h
@@ -84,7 +84,9 @@ extern "C" {
 /*-**************************************************************
 *  Basic Types
 *****************************************************************/
-#if  !defined (__VMS) && (defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
+#ifndef BASIC_TYPES_DEFINED
+#define BASIC_TYPES_DEFINED
+#if !defined (__VMS) && (defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
 # include <stdint.h>
   typedef  uint8_t BYTE;
   typedef uint16_t U16;
@@ -101,7 +103,8 @@ extern "C" {
   typedef   signed int        S32;
   typedef unsigned long long  U64;
   typedef   signed long long  S64;
-#endif 
+#endif
+#endif
 
 
 /*-****************************************