setjmp.h, time_t: Remove ancient retrocompatibility; Remove MSVC double to float...

[bertos.git] / compiler.h

diff --git a/compiler.h b/compiler.h
index 38dfe4e9c23a64802799868f7babc01677d501fc..73af8910e184d61d556606c441c53b038e5c3032 100755 (executable)
--- a/compiler.h
+++ b/compiler.h
@@ -14,6 +14,12 @@
 
 /*#*
  *#* $Log$
+ *#* 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
  *#*
@@ -22,9 +28,6 @@
  *#*
  *#* Revision 1.40  2005/01/20 18:46:04  aleph
  *#* Add progmem datatypes; PSTR() definition.
- *#*
- *#* Revision 1.39  2005/01/08 08:49:39  bernie
- *#* Define PROGMEM on AVR only when not including pgmspace.h.
  *#*/
 #ifndef DEVLIB_COMPILER_H
 #define DEVLIB_COMPILER_H
@@ -105,11 +108,6 @@
 
 #elif defined(_MSC_VER) /* Win32 emulation support */
 
-       #include <setjmp.h>
-
-       /* FIXME: I can't remember why exactly this was needed (NdBernie) */
-       #define float double
-
        /* MSVC doesn't provide <stdbool.h>. */
        #ifndef __cplusplus
                #define true (1==1)
@@ -150,13 +148,9 @@
        #if CPU_AVR
                #include <stddef.h>
                #include <stdbool.h>
-
-               /* TODO: reorganize client code to include mware/pgm.h as needed. */
-               #include <mware/pgm.h>
        #else
                /* Include some standard C89/C99 stuff */
                #include <stddef.h>
-               #include <setjmp.h>
                #include <stdbool.h>
        #endif
 
@@ -183,7 +177,6 @@
        #include <stdint.h>
        #include <stddef.h>
        #include <stdbool.h>
-       #include <setjmp.h>
 
        // CodeWarrior has size_t as built-in type, but does not define this symbol.
        #define _SIZE_T_DEFINED
@@ -367,15 +360,6 @@ typedef unsigned char page_t;    /*!< Type for banked memory pages. */
                typedef int ssize_t;
        #endif
 #endif
-
-#if !(defined(_TIME_T_DEFINED) || defined(__time_t_defined) || defined(_EMUL))
-       /*! For backwards compatibility.  Use mtime_t in new code. */
-       #define time_t mtime_t
-       #define SIZEOF_TIME_T SIZEOF_MTIME_T
-#else
-       /* Just a guess, but quite safe. */
-       #define SIZEOF_TIME_T SIZEOF_LONG
-#endif /* _TIME_T_DEFINED || __time_t_defined */
 /*\}*/