X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=compiler.h;h=d0049e38186b3459e6e8233b85854e87c34eb61c;hb=4560fc1a4dc7c27243d7f8afa9a1291e646c2f8b;hp=500cb0c2bddf7e7bacea816d74478995d90fbf04;hpb=247c83c29466e78214c7a1305274edc2778b92c5;p=bertos.git

diff --git a/compiler.h b/compiler.h
index 500cb0c2..d0049e38 100755
--- a/compiler.h
+++ b/compiler.h
@@ -15,6 +15,12 @@
 
 /*
  * $Log$
+ * Revision 1.16  2004/08/14 19:37:57  rasky
+ * Merge da SC: macros.h, pool.h, BIT_CHANGE, nome dei processi, etc.
+ *
+ * Revision 1.15  2004/08/13 03:23:26  bernie
+ * Adjust a few MSVC tweaks from older projects.
+ *
  * Revision 1.14  2004/08/10 06:56:29  bernie
  * RESTRICT: New C99-like macro; STATIC_ASSERT: Fix warning for multiple invocation in one file.
  *
@@ -76,6 +82,12 @@
 	#define GNUC_PREREQ(maj, min) 0
 #endif
 
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+	#define COMPILER_C99      1
+#else
+	#define COMPILER_C99      0
+#endif
+
 #if defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__)
 	#pragma language=extended
 	#define INTERRUPT(x)  interrupt [x]
@@ -119,10 +131,9 @@
 
 	#include <setjmp.h>
 	#include <time.h> /* for time_t */
-	#define float double
 
-	/* Ouch, ReleaseSemaphore() conflicts with a WIN32 call ;-( */
-	#define ReleaseSemaphore KReleaseSemaphore
+	/* FIXME: I can't remember why exactly this was needed (NdBernie) */
+	#define float double
 
 	/* Fake bool support */
 	#ifndef __cplusplus
@@ -131,6 +142,10 @@
 		typedef int bool;
 	#endif /* !__cplusplus */
 
+	/* These C99 functions are oddly named in MSVCRT32.lib */
+	#define snprintf _snprintf
+	#define vsnprintf _vsnprintf
+
 #elif defined(__GNUC__)
 
 	/* GCC attributes */
@@ -254,83 +269,6 @@
 #endif
 
 
-/* Quasi-ANSI macros */
-#ifndef offsetof
-	/*! offsetof(s,m) - Return the byte offset of the member \a m in struct \a s */
-	#define offsetof(s,m)   (size_t)&(((s *)0)->m)
-#endif
-#ifndef countof
-	/*! Count the number of elements in the static array \a a */
-	#define countof(a) (sizeof(a) / sizeof(*(a)))
-#endif
-
-
-/* Simple macros */
-#if GNUC_PREREQ(2,0)
-	#define ABS(n) ({ \
-		__typeof__(n) _n = (n); \
-		(_n < 0) ? -_n : _n; \
-	})
-	#define MIN(a,b) ({ \
-		__typeof__(a) _a = (a); \
-		__typeof__(b) _b = (b); \
-		(void)(&_a == &_b); /* ensure same type */ \
-		(_a < _b) ? _a : _b; \
-	})
-	#define MAX(a,b) ({ \
-		__typeof__(a) _a = (a); \
-		__typeof__(b) _b = (b); \
-		(void)(&_a == &_b); /* ensure same type */ \
-		(_a > _b) ? _a : _b; \
-	})
-#else /* !GNUC */
-	/* Buggy macros for inferior compilers */
-	#define ABS(a)		(((a) < 0) ? -(a) : (a))
-	#define MIN(a,b)	(((a) < (b)) ? (a) : (b))
-	#define MAX(a,b)	(((a) > (b)) ? (a) : (b))
-#endif /* !GNUC */
-
-#ifndef BV
-/*! Convert a bit value to a binary flag */
-#define BV(x)	(1<<(x))
-#endif
-
-/*! Round up \a x to an even multiple of the 2's power \a pad */
-#define ROUND2(x, pad) (((x) + ((pad) - 1)) & ~((pad) - 1))
-
-/*! Calculate a compile-time log2 for a uint8_t */
-#define UINT8_LOG2(x) \
-	((x) < 2 ? 0 : \
-	 ((x) < 4 ? 1 : \
-	  ((x) < 8 ? 2 : \
-	   ((x) < 16 ? 3 : \
-	    ((x) < 32 ? 4 : \
-	     ((x) < 64 ? 5 : \
-	      ((x) < 128 ? 6 : 7)))))))
-
-/*! Calculate a compile-time log2 for a uint16_t */
-#define UINT16_LOG2(x) \
-	((x < 256) ? UINT8_LOG2(x) : UINT8_LOG2((x) >> 8) + 8)
-
-/*! Calculate a compile-time log2 for a uint32_t */
-#define UINT32_LOG2(x) \
-	((x < 65536UL) ? UINT16_LOG2(x) : UINT16_LOG2((x) >> 16) + 16)
-
-/*! Concatenate two different preprocessor tokens (allowing macros to expand) */
-#define PP_CAT(x,y)         PP_CAT__(x,y)
-#define PP_CAT__(x,y)       x ## y
-#define PP_CAT3(x,y,z)      PP_CAT(PP_CAT(x,y),z)
-#define PP_CAT4(x,y,z,w)    PP_CAT(PP_CAT3(x,y,z),w)
-#define PP_CAT5(x,y,z,w,j)  PP_CAT(PP_CAT4(x,y,z,w),j)
-
-/*! String-ize a token (allowing macros to expand) */
-#define PP_STRINGIZE(x)     PP_STRINGIZE__(x)
-#define PP_STRINGIZE__(x)   #x
-
-/*! Issue a compilation error if the \a condition is false */
-#define STATIC_ASSERT(condition)  \
-	extern char PP_CAT(CT_ASSERT___, __LINE__)[(condition) ? 1 : -1]
-
 /*
  * Standard type definitions
  * These should be in <sys/types.h>, but many compilers lack them.