Sistema l'errore da me commesso in fase di conversione...

[bertos.git] / cfg / compiler.h

diff --git a/cfg/compiler.h b/cfg/compiler.h
old mode 100755 (executable)
new mode 100644 (file)
index 9f5462b..177b24b
--- a/cfg/compiler.h
+++ b/cfg/compiler.h
@@ -14,6 +14,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.24  2007/01/09 08:58:14  bernie
+ *#* Avoid dependency on cfg/compiler.h
+ *#*
+ *#* Revision 1.23  2006/09/13 18:28:38  bernie
+ *#* Reformat.
+ *#*
  *#* Revision 1.22  2006/07/19 12:56:25  bernie
  *#* Convert to new Doxygen style.
  *#*
@@ -419,11 +425,16 @@
        #define MTIME_INFINITE 0x7FFFL
 #else
        typedef int32_t ticks_t;  /**< Type for time expressed in ticks. */
-       typedef int32_t mtime_t;  /**< Type for time expressed in milliseconds. */
+
        typedef int32_t utime_t;  /**< Type for time expressed in microseconds. */
-       #define SIZEOF_MTIME_T (32 / CPU_BITS_PER_CHAR)
        #define SIZEOF_UTIME_T (32 / CPU_BITS_PER_CHAR)
-       #define MTIME_INFINITE 0x7FFFFFFFL
+
+       #ifndef DEVLIB_MTIME_DEFINED
+               #define DEVLIB_MTIME_DEFINED 1 /* Resolve conflict with <os/hptime.h> */
+               typedef int32_t mtime_t;  /**< Type for time expressed in milliseconds. */
+               #define SIZEOF_MTIME_T (32 / CPU_BITS_PER_CHAR)
+               #define MTIME_INFINITE 0x7FFFFFFFL
+       #endif
 #endif
 
 /** Bulk storage large enough for both pointers or integers. */
@@ -537,15 +548,15 @@ typedef unsigned char page_t;    /**< Type for banked memory pages. */
        UNUSED_VAR(extern char, STATIC_ASSERTION_FAILED__[(condition) ? 1 : -1])
 
 #ifndef ASSERT_TYPE_EQUAL
-/** Ensure two variables have the same type. */
-#define ASSERT_TYPE_EQUAL(var1, var2)  \
-               do { (void)(&(var1) == &(var2)); } while(0)
+       /** Ensure two variables have the same type. */
+       #define ASSERT_TYPE_EQUAL(var1, var2)  \
+                       do { (void)(&(var1) == &(var2)); } while(0)
 #endif
 
 #ifndef ASSERT_TYPE_IS
-/** Ensure variable is of specified type. */
-#define ASSERT_TYPE_IS(var, type)  \
-               do { (void)(&(var) == (type *)0); } while(0)
+       /** Ensure variable is of specified type. */
+       #define ASSERT_TYPE_IS(var, type)  \
+                       do { (void)(&(var) == (type *)0); } while(0)
 #endif
 
 #endif /* DEVLIB_COMPILER_H */