projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix naming conventions.
[bertos.git]
/
cfg
/
os.h
diff --git
a/cfg/os.h
b/cfg/os.h
index 2832779868f7fddf95f785862897779acfa41f34..eb82043ae0d4c6f613e2d220f9fd6a5f8c2afaac 100755
(executable)
--- a/
cfg/os.h
+++ b/
cfg/os.h
@@
-14,6
+14,15
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.9 2006/03/22 13:34:34 bernie
+ *#* MSVC support.
+ *#*
+ *#* Revision 1.8 2006/02/23 09:09:28 bernie
+ *#* Remove Linux specific hack.
+ *#*
+ *#* 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.
*#*
*#* Revision 1.6 2006/02/15 09:12:33 bernie
*#* Don't mask useful user signals on UNIX.
*#*
@@
-49,11
+58,19
@@
#ifdef _WIN32
#define OS_WIN32 1
#define OS_ID win32
#ifdef _WIN32
#define OS_WIN32 1
#define OS_ID win32
+
+ // FIXME: Maybe disable Win32 exceptions?
+ typedef int cpuflags_t;
+ #define IRQ_DISABLE /* FIXME */
+ #define IRQ_ENABLE /* FIXME */
+ #define IRQ_SAVE_DISABLE(old_sigs) /* FIXME */
+ #define IRQ_RESTORE(old_sigs) /* FIXME */
+
#else
#define OS_WIN32 0
#endif
#else
#define OS_WIN32 0
#endif
-#if
def __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
#define OS_UNIX 1
#define OS_POSIX 1 /* Not strictly UNIX, but no way to autodetect it. */
#define OS_ID posix
@@
-61,8
+78,6
@@
/*
* The POSIX moral equivalent of disabling IRQs is disabling signals.
*/
/*
* The POSIX moral equivalent of disabling IRQs is disabling signals.
*/
-// #define _XOPEN_SOURCE 600 /* Avoid BSDish stuff */
-// #undef _GNU_SOURCE /* This implies _BSD_SOURCE and is predefined on Linux. */
#include <signal.h>
typedef sigset_t cpuflags_t;
#include <signal.h>
typedef sigset_t cpuflags_t;
@@
-132,7
+147,7
@@
* Summarize hosted environments as OS_HOSTED and embedded
* environment with OS_EMBEDDED.
*/
* 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
#define OS_HOSTED 1
#define OS_EMBEDDED 0
#else