diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 1996-09-05 13:31:54 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 1996-09-05 13:31:54 +0000 |
| commit | b973b44d9fa9e63d5504cc59e5078411b30efe03 (patch) | |
| tree | 224417837a2416aae94ac9ad156b00e5eb9de19b | |
| parent | ad0af4415634ce9678108b9609f38f5ee5177896 (diff) | |
Partage du code avec win32unix.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@955 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | otherlibs/unix/access.c | 23 | ||||
| -rw-r--r-- | otherlibs/unix/socketaddr.c | 4 |
2 files changed, 19 insertions, 8 deletions
diff --git a/otherlibs/unix/access.c b/otherlibs/unix/access.c index 4041a1780..605adda2f 100644 --- a/otherlibs/unix/access.c +++ b/otherlibs/unix/access.c @@ -16,15 +16,22 @@ #include "unixsupport.h" #ifdef HAS_UNISTD -#include <unistd.h> +# include <unistd.h> #else -#include <sys/file.h> -#ifndef R_OK -#define R_OK 4/* test for read permission */ -#define W_OK 2/* test for write permission */ -#define X_OK 1/* test for execute (search) permission */ -#define F_OK 0/* test for presence of file */ -#endif +# ifndef _WIN32 +# include <sys/file.h> +# ifndef R_OK +# define R_OK 4/* test for read permission */ +# define W_OK 2/* test for write permission */ +# define X_OK 1/* test for execute (search) permission */ +# define F_OK 0/* test for presence of file */ +# endif +# else +# define R_OK 4/* test for read permission */ +# define W_OK 2/* test for write permission */ +# define X_OK 4/* test for execute (search) permission */ +# define F_OK 0/* test for presence of file */ +# endif #endif static int access_permission_table[] = { diff --git a/otherlibs/unix/socketaddr.c b/otherlibs/unix/socketaddr.c index 6660390e8..c62538b21 100644 --- a/otherlibs/unix/socketaddr.c +++ b/otherlibs/unix/socketaddr.c @@ -22,6 +22,10 @@ #include "socketaddr.h" +#ifdef _WIN32 +#define EAFNOSUPPORT WSAEAFNOSUPPORT +#endif + value alloc_inet_addr(a) unsigned int a; { |