diff options
author | stijn <stinos@zoho.com> | 2015-08-14 12:04:23 +0200 |
---|---|---|
committer | stijn <stinos@zoho.com> | 2015-08-14 12:04:23 +0200 |
commit | 3179d23cee8d972d93f61e205a359c4ecf0cf54c (patch) | |
tree | 7f6bff5cd018ccb80a0426c62062afeb846c49bd | |
parent | bdd78c31b68db5323796d93e0a17159806ce10fc (diff) | |
download | micropython-3179d23cee8d972d93f61e205a359c4ecf0cf54c.tar.gz micropython-3179d23cee8d972d93f61e205a359c4ecf0cf54c.zip |
windows: Make unistd.h more posix compatible
- add SEEK_XXX definitions, this fixes missing definition in py/stream.c
- move R_OK from realpath.c and add W_OK/F_OK defintions
- move STDXXX_FILENO definitions from mpconfigport for consistency
-rw-r--r-- | windows/mpconfigport.h | 3 | ||||
-rw-r--r-- | windows/msvc/unistd.h | 12 | ||||
-rw-r--r-- | windows/realpath.c | 6 |
3 files changed, 13 insertions, 8 deletions
diff --git a/windows/mpconfigport.h b/windows/mpconfigport.h index a9c8b7861e..f63f901f0b 100644 --- a/windows/mpconfigport.h +++ b/windows/mpconfigport.h @@ -186,9 +186,6 @@ void msec_sleep(double msec); #define restrict #define inline __inline #define alignof(t) __alignof(t) -#define STDIN_FILENO 0 -#define STDOUT_FILENO 1 -#define STDERR_FILENO 2 #define PATH_MAX MICROPY_ALLOC_PATH_MAX #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) diff --git a/windows/msvc/unistd.h b/windows/msvc/unistd.h index ece86fa749..add10c8843 100644 --- a/windows/msvc/unistd.h +++ b/windows/msvc/unistd.h @@ -26,3 +26,15 @@ // There's no unistd.h, but this is the equivalent #include <io.h> + +#define F_OK 0 +#define W_OK 2 +#define R_OK 4 + +#define STDIN_FILENO 0 +#define STDOUT_FILENO 1 +#define STDERR_FILENO 2 + +#define SEEK_CUR 1 +#define SEEK_END 2 +#define SEEK_SET 0 diff --git a/windows/realpath.c b/windows/realpath.c index 2fd86aa272..c0ed6b84da 100644 --- a/windows/realpath.c +++ b/windows/realpath.c @@ -26,11 +26,7 @@ #include <stdlib.h> #include <errno.h> -#include <io.h> - -#ifndef R_OK - #define R_OK 4 -#endif +#include <unistd.h> // Make sure a path only has forward slashes. char *to_unix_path(char *p) { |