Port to MacOSX.

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

diff --git a/cfg/os.h b/cfg/os.h
index 2832779868f7fddf95f785862897779acfa41f34..f936ebb9495a566cacb03fdc21cc83ef3fff28ac 100755 (executable)
--- a/cfg/os.h
+++ b/cfg/os.h
@@ -14,6 +14,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.7  2006/02/20 01:46:59  bernie
+ *#* Port to MacOSX.
+ *#*
  *#* Revision 1.6  2006/02/15 09:12:33  bernie
  *#* Don't mask useful user signals on UNIX.
  *#*
@@ -53,7 +56,7 @@
        #define OS_WIN32  0
 #endif
 
-#ifdef __unix__
+#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
        #define OS_UNIX   1
        #define OS_POSIX  1  /* Not strictly UNIX, but no way to autodetect it. */
        #define OS_ID     posix
@@ -132,7 +135,7 @@
  * Summarize hosted environments as OS_HOSTED and embedded
  * environment with OS_EMBEDDED.
  */
-#if OS_WIN32 || OS_UNIX
+#if OS_WIN32 || OS_UNIX || OS_DARWIN
        #define OS_HOSTED   1
        #define OS_EMBEDDED 0
 #else

diff --git a/os/hptime.c b/os/hptime.c
index 7c53d9dfb959f95a4516dcd3c36a8019eac2f40c..57ccf34df46462c52fa6657a199558f5e47b30d7 100755 (executable)
--- a/os/hptime.c
+++ b/os/hptime.c
@@ -13,6 +13,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.6  2006/02/20 01:46:46  bernie
+ *#* Port to MacOSX.
+ *#*
  *#* Revision 1.5  2005/11/04 16:20:02  bernie
  *#* Fix reference to README.devlib in header.
  *#*
@@ -53,7 +56,7 @@ hptime_t hptime_get(void)
        return (((hptime_t)ft.dwHighDateTime) << 32) + (hptime_t)ft.dwLowDateTime;
 }
 
-#elif defined(__unix__)
+#elif defined(__unix__) || defined(__APPLE__) && defined(__MACH__)
 
 #include <sys/time.h>
 

diff --git a/os/hptime.h b/os/hptime.h
index 2a9670248e9e8feed0ab3a85afad72220a00fa4f..20994e815534ca0d9cbea6e6d838f72902b18d2a 100755 (executable)
--- a/os/hptime.h
+++ b/os/hptime.h
@@ -13,6 +13,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.8  2006/02/20 01:46:46  bernie
+ *#* Port to MacOSX.
+ *#*
  *#* Revision 1.7  2006/01/16 03:28:25  bernie
  *#* Remove redundant mtime_t definition (cfg/compiler.h has one already).
  *#*
@@ -51,7 +54,7 @@ extern "C" {
        #define HPTIME_TICKS_PER_MILLISEC       ((hptime_t)10000I64)
        #define HPTIME_TICKS_PER_MICRO          ((hptime_t)10I64)
 
-#elif defined(__unix__)
+#elif defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
 
        #include <stdint.h>