From 94d6b489cc031d86359c89ef1f2f0669a8bf0094 Mon Sep 17 00:00:00 2001
From: bernie <bernie@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Sun, 29 Aug 2004 21:57:58 +0000
Subject: [PATCH] Move back STATIC_ASSERT() to compiler.h as it's needed in
 cpu.h; iptr_t, const_iptr_t: Replace IPTR macro with a real typedef.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@175 38d2e660-2303-0410-9eaa-f027e97ec537
---
 compiler.h | 17 +++++++++++++----
 macros.h   |  9 +++------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/compiler.h b/compiler.h
index 96f9c9ac..0683d7e2 100755
--- a/compiler.h
+++ b/compiler.h
@@ -15,6 +15,10 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.20  2004/08/29 21:57:58  bernie
+ *#* Move back STATIC_ASSERT() to compiler.h as it's needed in cpu.h;
+ *#* iptr_t, const_iptr_t: Replace IPTR macro with a real typedef.
+ *#*
  *#* Revision 1.19  2004/08/25 14:12:08  rasky
  *#* Aggiornato il comment block dei log RCS
  *#*
@@ -267,7 +271,7 @@
 
 
 /*
- * Standard type definitions
+ * Standard type definitions.
  * These should be in <sys/types.h>, but many compilers lack them.
  */
 #if !(defined(size_t) || defined(_SIZE_T_DEFINED))
@@ -278,9 +282,10 @@
 	typedef long time_t;
 #endif /* _TIME_T_DEFINED || __time_t_defined */
 
-/*! Storage for pointers and integers */
-/* FIXME: turn this into a typedef? */
-#define IPTR void *
+/*! Bulk storage large enough for both pointers or integers */
+typedef void * iptr_t;
+typedef const void * const_iptr_t;
+#define IPTR iptr_t  /* OBSOLETE */
 
 typedef long utime_t;            /*!< Type for time expressed in microseconds */
 typedef unsigned char sig_t;     /*!< Type for signal bits */
@@ -347,4 +352,8 @@ typedef unsigned char page_t;    /*!< Type for banked memory pages */
 	#define countof(a)  (sizeof(a) / sizeof(*(a)))
 #endif
 
+/*! Issue a compilation error if the \a condition is false */
+#define STATIC_ASSERT(condition)  \
+	extern char PP_CAT(CT_ASSERT___, __LINE__)[(condition) ? 1 : -1]
+
 #endif /* DEVLIB_COMPILER_H */
diff --git a/macros.h b/macros.h
index 797db21d..8723fc1c 100755
--- a/macros.h
+++ b/macros.h
@@ -15,8 +15,9 @@
 
 /*#*
  *#* $Log$
- *#* Revision 1.4  2004/08/25 14:12:08  rasky
- *#* Aggiornato il comment block dei log RCS
+ *#* Revision 1.5  2004/08/29 21:57:58  bernie
+ *#* Move back STATIC_ASSERT() to compiler.h as it's needed in cpu.h;
+ *#* iptr_t, const_iptr_t: Replace IPTR macro with a real typedef.
  *#*
  *#* Revision 1.3  2004/08/24 14:13:48  bernie
  *#* Restore a few macros that were lost in the way.
@@ -113,10 +114,6 @@
 		count
 #endif
 
-/*! Issue a compilation error if the \a condition is false */
-#define STATIC_ASSERT(condition)  \
-	extern char PP_CAT(CT_ASSERT___, __LINE__)[(condition) ? 1 : -1]
-
 #if COMPILER_C99
 	/*!
 	 * \def BIT_CHANGE(reg, (mask, value), ...)
-- 
2.25.1