X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=cfg%2Fcompiler.h;h=177b24bdbb5e9cd557be6da24aac62584b1a8ead;hb=5f3952176a4e9a00ca8dd5ec4a6b994958f89e0a;hp=05266367b9452c96a162fbf6467cca76452730dc;hpb=6720e3d937d90fea2a1cb270f87ac8b3bd7e7353;p=bertos.git

diff --git a/cfg/compiler.h b/cfg/compiler.h
old mode 100755
new mode 100644
index 05266367..177b24bd
--- a/cfg/compiler.h
+++ b/cfg/compiler.h
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
@@ -14,6 +14,18 @@
 
 /*#*
  *#* $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.
+ *#*
+ *#* Revision 1.21  2006/07/19 12:53:43  bernie
+ *#* Prune log.
+ *#*
  *#* Revision 1.20  2006/06/10 05:36:15  bernie
  *#* Convert to new Doxygen comments.
  *#*
@@ -73,21 +85,6 @@
  *#*
  *#* Revision 1.1  2005/04/11 19:04:13  bernie
  *#* Move top-level headers to cfg/ subdir.
- *#*
- *#* Revision 1.44  2005/03/29 06:39:59  bernie
- *#* setjmp.h, time_t: Remove ancient retrocompatibility; Remove MSVC double to float hack.
- *#*
- *#* Revision 1.43  2005/03/01 23:15:12  bernie
- *#* Remove compatibility hack.
- *#*
- *#* Revision 1.42  2005/02/16 20:28:46  bernie
- *#* Move PGM macros to mware/pgm.h
- *#*
- *#* Revision 1.41  2005/01/22 04:19:22  bernie
- *#* MTIME_INFINITE: New constant.
- *#*
- *#* Revision 1.40  2005/01/20 18:46:04  aleph
- *#* Add progmem datatypes; PSTR() definition.
  *#*/
 #ifndef DEVLIB_COMPILER_H
 #define DEVLIB_COMPILER_H
@@ -428,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. */
@@ -546,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 */