From: bernie <bernie@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Tue, 9 Jan 2007 08:58:14 +0000 (+0000)
Subject: Avoid dependency on cfg/compiler.h
X-Git-Tag: 1.0.0~507
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=a122edc5c72e77a9610e15753a5aca4987ed74c3;p=bertos.git

Avoid dependency on cfg/compiler.h


git-svn-id: https://src.develer.com/svnoss/bertos/trunk@734 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/cfg/compiler.h b/cfg/compiler.h
index 3e2b1ab3..177b24bd 100755
--- a/cfg/compiler.h
+++ b/cfg/compiler.h
@@ -14,6 +14,9 @@
 
 /*#*
  *#* $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.
  *#*
@@ -422,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. */
diff --git a/os/hptime.h b/os/hptime.h
index e5ec70d8..99b66339 100755
--- a/os/hptime.h
+++ b/os/hptime.h
@@ -30,6 +30,13 @@ extern "C" {
 
 	#include <stdint.h> /* int64_t */
 
+	#ifndef DEVLIB_MTIME_DEFINED
+		#define DEVLIB_MTIME_DEFINED 1 /* Resolve conflict with <cfg/compiler.h> */
+		typedef int32_t mtime_t;
+		#define SIZEOF_MTIME_T (32 / CPU_BITS_PER_CHAR)
+		#define MTIME_INFINITE 0x7FFFFFFFL
+	#endif
+
 	/** Type for "high precision absolute time". */
 	typedef int64_t hptime_t;