summaryrefslogtreecommitdiffstats
path: root/otherlibs/win32unix
diff options
context:
space:
mode:
Diffstat (limited to 'otherlibs/win32unix')
-rw-r--r--otherlibs/win32unix/accept.c8
-rw-r--r--otherlibs/win32unix/bind.c2
-rw-r--r--otherlibs/win32unix/channels.c8
-rw-r--r--otherlibs/win32unix/close.c4
-rw-r--r--otherlibs/win32unix/close_on.c2
-rw-r--r--otherlibs/win32unix/connect.c4
-rw-r--r--otherlibs/win32unix/createprocess.c4
-rw-r--r--otherlibs/win32unix/dup.c2
-rw-r--r--otherlibs/win32unix/dup2.c2
-rw-r--r--otherlibs/win32unix/errmsg.c4
-rw-r--r--otherlibs/win32unix/getpeername.c2
-rw-r--r--otherlibs/win32unix/getpid.c2
-rw-r--r--otherlibs/win32unix/getsockname.c2
-rw-r--r--otherlibs/win32unix/gettimeofday.c4
-rw-r--r--otherlibs/win32unix/link.c4
-rw-r--r--otherlibs/win32unix/listen.c2
-rw-r--r--otherlibs/win32unix/lockf.c8
-rw-r--r--otherlibs/win32unix/lseek.c4
-rw-r--r--otherlibs/win32unix/mkdir.c2
-rwxr-xr-xotherlibs/win32unix/nonblock.c4
-rw-r--r--otherlibs/win32unix/open.c4
-rw-r--r--otherlibs/win32unix/pipe.c6
-rw-r--r--otherlibs/win32unix/read.c6
-rw-r--r--otherlibs/win32unix/rename.c2
-rw-r--r--otherlibs/win32unix/select.c10
-rw-r--r--otherlibs/win32unix/sendrecv.c8
-rw-r--r--otherlibs/win32unix/shutdown.c2
-rw-r--r--otherlibs/win32unix/sleep.c4
-rw-r--r--otherlibs/win32unix/socket.c2
-rw-r--r--otherlibs/win32unix/socketaddr.h2
-rw-r--r--otherlibs/win32unix/sockopt.c8
-rw-r--r--otherlibs/win32unix/startup.c2
-rw-r--r--otherlibs/win32unix/stat.c6
-rw-r--r--otherlibs/win32unix/system.c8
-rw-r--r--otherlibs/win32unix/times.c4
-rw-r--r--otherlibs/win32unix/unixsupport.c12
-rw-r--r--otherlibs/win32unix/windir.c8
-rw-r--r--otherlibs/win32unix/winwait.c8
-rw-r--r--otherlibs/win32unix/winworker.c8
-rw-r--r--otherlibs/win32unix/write.c6
40 files changed, 95 insertions, 95 deletions
diff --git a/otherlibs/win32unix/accept.c b/otherlibs/win32unix/accept.c
index f2e14467a..f705f0f09 100644
--- a/otherlibs/win32unix/accept.c
+++ b/otherlibs/win32unix/accept.c
@@ -11,10 +11,10 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
-#include <alloc.h>
-#include <memory.h>
-#include <signals.h>
+#include <caml/mlvalues.h>
+#include <caml/alloc.h>
+#include <caml/memory.h>
+#include <caml/signals.h>
#include "unixsupport.h"
#include <mswsock.h> // for SO_OPENTYPE and SO_SYNCHRONOUS_NONALERT
#include "socketaddr.h"
diff --git a/otherlibs/win32unix/bind.c b/otherlibs/win32unix/bind.c
index bc0923089..4b1d3def6 100644
--- a/otherlibs/win32unix/bind.c
+++ b/otherlibs/win32unix/bind.c
@@ -11,7 +11,7 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
+#include <caml/mlvalues.h>
#include "unixsupport.h"
#include "socketaddr.h"
diff --git a/otherlibs/win32unix/channels.c b/otherlibs/win32unix/channels.c
index 1e7e823ac..b6350e174 100644
--- a/otherlibs/win32unix/channels.c
+++ b/otherlibs/win32unix/channels.c
@@ -11,10 +11,10 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
-#include <alloc.h>
-#include <io.h>
-#include <memory.h>
+#include <caml/mlvalues.h>
+#include <caml/alloc.h>
+#include <caml/io.h>
+#include <caml/memory.h>
#include "unixsupport.h"
#include <fcntl.h>
diff --git a/otherlibs/win32unix/close.c b/otherlibs/win32unix/close.c
index 20b131b05..7f8da29da 100644
--- a/otherlibs/win32unix/close.c
+++ b/otherlibs/win32unix/close.c
@@ -11,9 +11,9 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
+#include <caml/mlvalues.h>
#include "unixsupport.h"
-#include <io.h>
+#include <caml/io.h>
extern int _close(int);
diff --git a/otherlibs/win32unix/close_on.c b/otherlibs/win32unix/close_on.c
index 9ba342ed0..7a316abca 100644
--- a/otherlibs/win32unix/close_on.c
+++ b/otherlibs/win32unix/close_on.c
@@ -11,7 +11,7 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
+#include <caml/mlvalues.h>
#include "unixsupport.h"
#include <windows.h>
diff --git a/otherlibs/win32unix/connect.c b/otherlibs/win32unix/connect.c
index 190eb742a..37cdbdaa8 100644
--- a/otherlibs/win32unix/connect.c
+++ b/otherlibs/win32unix/connect.c
@@ -11,8 +11,8 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
-#include <signals.h>
+#include <caml/mlvalues.h>
+#include <caml/signals.h>
#include "unixsupport.h"
#include "socketaddr.h"
diff --git a/otherlibs/win32unix/createprocess.c b/otherlibs/win32unix/createprocess.c
index 3858a39b8..791acbb50 100644
--- a/otherlibs/win32unix/createprocess.c
+++ b/otherlibs/win32unix/createprocess.c
@@ -11,10 +11,10 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
+#include <caml/mlvalues.h>
#include "unixsupport.h"
#include <windows.h>
-#include <osdeps.h>
+#include <caml/osdeps.h>
static int win_has_console(void);
diff --git a/otherlibs/win32unix/dup.c b/otherlibs/win32unix/dup.c
index 76cbdf670..5db19e307 100644
--- a/otherlibs/win32unix/dup.c
+++ b/otherlibs/win32unix/dup.c
@@ -11,7 +11,7 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
+#include <caml/mlvalues.h>
#include "unixsupport.h"
CAMLprim value unix_dup(value fd)
diff --git a/otherlibs/win32unix/dup2.c b/otherlibs/win32unix/dup2.c
index 5f19710c3..518420779 100644
--- a/otherlibs/win32unix/dup2.c
+++ b/otherlibs/win32unix/dup2.c
@@ -11,7 +11,7 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
+#include <caml/mlvalues.h>
#include "unixsupport.h"
extern int _dup2(int, int);
diff --git a/otherlibs/win32unix/errmsg.c b/otherlibs/win32unix/errmsg.c
index c3bc19c6b..6107abc39 100644
--- a/otherlibs/win32unix/errmsg.c
+++ b/otherlibs/win32unix/errmsg.c
@@ -14,8 +14,8 @@
#include <stdio.h>
#include <errno.h>
#include <string.h>
-#include <mlvalues.h>
-#include <alloc.h>
+#include <caml/mlvalues.h>
+#include <caml/alloc.h>
#include "unixsupport.h"
extern int error_table[];
diff --git a/otherlibs/win32unix/getpeername.c b/otherlibs/win32unix/getpeername.c
index ad6674bf6..3467e03fd 100644
--- a/otherlibs/win32unix/getpeername.c
+++ b/otherlibs/win32unix/getpeername.c
@@ -11,7 +11,7 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
+#include <caml/mlvalues.h>
#include "unixsupport.h"
#include "socketaddr.h"
diff --git a/otherlibs/win32unix/getpid.c b/otherlibs/win32unix/getpid.c
index 65c8828a1..06d95356e 100644
--- a/otherlibs/win32unix/getpid.c
+++ b/otherlibs/win32unix/getpid.c
@@ -11,7 +11,7 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
+#include <caml/mlvalues.h>
#include "unixsupport.h"
extern value val_process_id;
diff --git a/otherlibs/win32unix/getsockname.c b/otherlibs/win32unix/getsockname.c
index 1e28f4b22..21e9d0630 100644
--- a/otherlibs/win32unix/getsockname.c
+++ b/otherlibs/win32unix/getsockname.c
@@ -11,7 +11,7 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
+#include <caml/mlvalues.h>
#include "unixsupport.h"
#include "socketaddr.h"
diff --git a/otherlibs/win32unix/gettimeofday.c b/otherlibs/win32unix/gettimeofday.c
index 573821fd7..e018c340a 100644
--- a/otherlibs/win32unix/gettimeofday.c
+++ b/otherlibs/win32unix/gettimeofday.c
@@ -11,8 +11,8 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
-#include <alloc.h>
+#include <caml/mlvalues.h>
+#include <caml/alloc.h>
#include <time.h>
#include "unixsupport.h"
diff --git a/otherlibs/win32unix/link.c b/otherlibs/win32unix/link.c
index 97748ba2c..93d21508a 100644
--- a/otherlibs/win32unix/link.c
+++ b/otherlibs/win32unix/link.c
@@ -11,8 +11,8 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
-#include <fail.h>
+#include <caml/mlvalues.h>
+#include <caml/fail.h>
#include "unixsupport.h"
#include <windows.h>
diff --git a/otherlibs/win32unix/listen.c b/otherlibs/win32unix/listen.c
index 9602a3736..767db61d7 100644
--- a/otherlibs/win32unix/listen.c
+++ b/otherlibs/win32unix/listen.c
@@ -11,7 +11,7 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
+#include <caml/mlvalues.h>
#include "unixsupport.h"
CAMLprim value unix_listen(sock, backlog)
diff --git a/otherlibs/win32unix/lockf.c b/otherlibs/win32unix/lockf.c
index 6e6ca0ad6..9c705a678 100644
--- a/otherlibs/win32unix/lockf.c
+++ b/otherlibs/win32unix/lockf.c
@@ -15,12 +15,12 @@
#include <errno.h>
#include <fcntl.h>
-#include <mlvalues.h>
-#include <memory.h>
-#include <fail.h>
+#include <caml/mlvalues.h>
+#include <caml/memory.h>
+#include <caml/fail.h>
#include "unixsupport.h"
#include <stdio.h>
-#include <signals.h>
+#include <caml/signals.h>
#ifndef INVALID_SET_FILE_POINTER
#define INVALID_SET_FILE_POINTER (-1)
diff --git a/otherlibs/win32unix/lseek.c b/otherlibs/win32unix/lseek.c
index 5306331c6..6c30a62ae 100644
--- a/otherlibs/win32unix/lseek.c
+++ b/otherlibs/win32unix/lseek.c
@@ -11,8 +11,8 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
-#include <alloc.h>
+#include <caml/mlvalues.h>
+#include <caml/alloc.h>
#include "unixsupport.h"
#ifdef HAS_UNISTD
diff --git a/otherlibs/win32unix/mkdir.c b/otherlibs/win32unix/mkdir.c
index 998b32baf..21bca10ce 100644
--- a/otherlibs/win32unix/mkdir.c
+++ b/otherlibs/win32unix/mkdir.c
@@ -11,7 +11,7 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
+#include <caml/mlvalues.h>
#include "unixsupport.h"
CAMLprim value unix_mkdir(path, perm)
diff --git a/otherlibs/win32unix/nonblock.c b/otherlibs/win32unix/nonblock.c
index a9aaeca5c..4001beca6 100755
--- a/otherlibs/win32unix/nonblock.c
+++ b/otherlibs/win32unix/nonblock.c
@@ -11,8 +11,8 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
-#include <signals.h>
+#include <caml/mlvalues.h>
+#include <caml/signals.h>
#include "unixsupport.h"
CAMLprim value unix_set_nonblock(socket)
diff --git a/otherlibs/win32unix/open.c b/otherlibs/win32unix/open.c
index afb8d0fb9..f9e9df21a 100644
--- a/otherlibs/win32unix/open.c
+++ b/otherlibs/win32unix/open.c
@@ -11,8 +11,8 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
-#include <alloc.h>
+#include <caml/mlvalues.h>
+#include <caml/alloc.h>
#include "unixsupport.h"
#include <fcntl.h>
diff --git a/otherlibs/win32unix/pipe.c b/otherlibs/win32unix/pipe.c
index fe553778a..88debb023 100644
--- a/otherlibs/win32unix/pipe.c
+++ b/otherlibs/win32unix/pipe.c
@@ -11,9 +11,9 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
-#include <memory.h>
-#include <alloc.h>
+#include <caml/mlvalues.h>
+#include <caml/memory.h>
+#include <caml/alloc.h>
#include "unixsupport.h"
#include <fcntl.h>
diff --git a/otherlibs/win32unix/read.c b/otherlibs/win32unix/read.c
index e7a2b38d7..d65683cc6 100644
--- a/otherlibs/win32unix/read.c
+++ b/otherlibs/win32unix/read.c
@@ -12,9 +12,9 @@
/***********************************************************************/
#include <string.h>
-#include <mlvalues.h>
-#include <memory.h>
-#include <signals.h>
+#include <caml/mlvalues.h>
+#include <caml/memory.h>
+#include <caml/signals.h>
#include "unixsupport.h"
CAMLprim value unix_read(value fd, value buf, value ofs, value vlen)
diff --git a/otherlibs/win32unix/rename.c b/otherlibs/win32unix/rename.c
index b8c0f3edc..ad46ead24 100644
--- a/otherlibs/win32unix/rename.c
+++ b/otherlibs/win32unix/rename.c
@@ -12,7 +12,7 @@
/***********************************************************************/
#include <stdio.h>
-#include <mlvalues.h>
+#include <caml/mlvalues.h>
#include "unixsupport.h"
CAMLprim value unix_rename(value path1, value path2)
diff --git a/otherlibs/win32unix/select.c b/otherlibs/win32unix/select.c
index d4afe4986..0e21db897 100644
--- a/otherlibs/win32unix/select.c
+++ b/otherlibs/win32unix/select.c
@@ -11,11 +11,11 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
-#include <alloc.h>
-#include <memory.h>
-#include <fail.h>
-#include <signals.h>
+#include <caml/mlvalues.h>
+#include <caml/alloc.h>
+#include <caml/memory.h>
+#include <caml/fail.h>
+#include <caml/signals.h>
#include "winworker.h"
#include <stdio.h>
#include "windbug.h"
diff --git a/otherlibs/win32unix/sendrecv.c b/otherlibs/win32unix/sendrecv.c
index 32532553f..5957f6ed8 100644
--- a/otherlibs/win32unix/sendrecv.c
+++ b/otherlibs/win32unix/sendrecv.c
@@ -11,10 +11,10 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
-#include <alloc.h>
-#include <memory.h>
-#include <signals.h>
+#include <caml/mlvalues.h>
+#include <caml/alloc.h>
+#include <caml/memory.h>
+#include <caml/signals.h>
#include "unixsupport.h"
#include "socketaddr.h"
diff --git a/otherlibs/win32unix/shutdown.c b/otherlibs/win32unix/shutdown.c
index 2d5707a35..960231116 100644
--- a/otherlibs/win32unix/shutdown.c
+++ b/otherlibs/win32unix/shutdown.c
@@ -11,7 +11,7 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
+#include <caml/mlvalues.h>
#include "unixsupport.h"
static int shutdown_command_table[] = {
diff --git a/otherlibs/win32unix/sleep.c b/otherlibs/win32unix/sleep.c
index 28e60e40a..6d630d205 100644
--- a/otherlibs/win32unix/sleep.c
+++ b/otherlibs/win32unix/sleep.c
@@ -11,8 +11,8 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
-#include <signals.h>
+#include <caml/mlvalues.h>
+#include <caml/signals.h>
#include "unixsupport.h"
CAMLprim value unix_sleep(t)
diff --git a/otherlibs/win32unix/socket.c b/otherlibs/win32unix/socket.c
index ad8165b29..9385e82e7 100644
--- a/otherlibs/win32unix/socket.c
+++ b/otherlibs/win32unix/socket.c
@@ -11,7 +11,7 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
+#include <caml/mlvalues.h>
#include "unixsupport.h"
#include <mswsock.h> // for SO_OPENTYPE and SO_SYNCHRONOUS_NONALERT
diff --git a/otherlibs/win32unix/socketaddr.h b/otherlibs/win32unix/socketaddr.h
index fde691ec6..9c36380a0 100644
--- a/otherlibs/win32unix/socketaddr.h
+++ b/otherlibs/win32unix/socketaddr.h
@@ -11,7 +11,7 @@
/* */
/***********************************************************************/
-#include "misc.h"
+#include "caml/misc.h"
union sock_addr_union {
struct sockaddr s_gen;
diff --git a/otherlibs/win32unix/sockopt.c b/otherlibs/win32unix/sockopt.c
index eefa9a309..aebc517a0 100644
--- a/otherlibs/win32unix/sockopt.c
+++ b/otherlibs/win32unix/sockopt.c
@@ -12,10 +12,10 @@
/***********************************************************************/
#include <errno.h>
-#include <mlvalues.h>
-#include <memory.h>
-#include <alloc.h>
-#include <fail.h>
+#include <caml/mlvalues.h>
+#include <caml/memory.h>
+#include <caml/alloc.h>
+#include <caml/fail.h>
#include "unixsupport.h"
#include "socketaddr.h"
diff --git a/otherlibs/win32unix/startup.c b/otherlibs/win32unix/startup.c
index 65aedc6a8..be66c8a82 100644
--- a/otherlibs/win32unix/startup.c
+++ b/otherlibs/win32unix/startup.c
@@ -14,7 +14,7 @@
#include <stdio.h>
#include <fcntl.h>
#include <stdlib.h>
-#include <mlvalues.h>
+#include <caml/mlvalues.h>
#include "winworker.h"
#include "windbug.h"
diff --git a/otherlibs/win32unix/stat.c b/otherlibs/win32unix/stat.c
index 56b45d037..46fc9841b 100644
--- a/otherlibs/win32unix/stat.c
+++ b/otherlibs/win32unix/stat.c
@@ -12,9 +12,9 @@
/***********************************************************************/
#include <errno.h>
-#include <mlvalues.h>
-#include <memory.h>
-#include <alloc.h>
+#include <caml/mlvalues.h>
+#include <caml/memory.h>
+#include <caml/alloc.h>
#include "unixsupport.h"
#include "cst2constr.h"
#define _INTEGRAL_MAX_BITS 64
diff --git a/otherlibs/win32unix/system.c b/otherlibs/win32unix/system.c
index 13d5658e6..202dcd081 100644
--- a/otherlibs/win32unix/system.c
+++ b/otherlibs/win32unix/system.c
@@ -11,10 +11,10 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
-#include <memory.h>
-#include <alloc.h>
-#include <signals.h>
+#include <caml/mlvalues.h>
+#include <caml/memory.h>
+#include <caml/alloc.h>
+#include <caml/signals.h>
#include "unixsupport.h"
#include <process.h>
#include <stdio.h>
diff --git a/otherlibs/win32unix/times.c b/otherlibs/win32unix/times.c
index e6b5ab0ab..e97d3a5c2 100644
--- a/otherlibs/win32unix/times.c
+++ b/otherlibs/win32unix/times.c
@@ -11,8 +11,8 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
-#include <alloc.h>
+#include <caml/mlvalues.h>
+#include <caml/alloc.h>
#include "unixsupport.h"
#include <windows.h>
diff --git a/otherlibs/win32unix/unixsupport.c b/otherlibs/win32unix/unixsupport.c
index f954dfc96..5c606e0d0 100644
--- a/otherlibs/win32unix/unixsupport.c
+++ b/otherlibs/win32unix/unixsupport.c
@@ -12,12 +12,12 @@
/***********************************************************************/
#include <stddef.h>
-#include <mlvalues.h>
-#include <callback.h>
-#include <alloc.h>
-#include <memory.h>
-#include <fail.h>
-#include <custom.h>
+#include <caml/mlvalues.h>
+#include <caml/callback.h>
+#include <caml/alloc.h>
+#include <caml/memory.h>
+#include <caml/fail.h>
+#include <caml/custom.h>
#include "unixsupport.h"
#include "cst2constr.h"
#include <errno.h>
diff --git a/otherlibs/win32unix/windir.c b/otherlibs/win32unix/windir.c
index 7a08e510a..ef952aa90 100644
--- a/otherlibs/win32unix/windir.c
+++ b/otherlibs/win32unix/windir.c
@@ -11,11 +11,11 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
-#include <memory.h>
+#include <caml/mlvalues.h>
+#include <caml/memory.h>
#include <errno.h>
-#include <alloc.h>
-#include <fail.h>
+#include <caml/alloc.h>
+#include <caml/fail.h>
#include "unixsupport.h"
CAMLprim value win_findfirst(name)
diff --git a/otherlibs/win32unix/winwait.c b/otherlibs/win32unix/winwait.c
index 0436072f1..510a16fea 100644
--- a/otherlibs/win32unix/winwait.c
+++ b/otherlibs/win32unix/winwait.c
@@ -11,10 +11,10 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
-#include <alloc.h>
-#include <memory.h>
-#include <signals.h>
+#include <caml/mlvalues.h>
+#include <caml/alloc.h>
+#include <caml/memory.h>
+#include <caml/signals.h>
#include "unixsupport.h"
#include <windows.h>
#include <sys/types.h>
diff --git a/otherlibs/win32unix/winworker.c b/otherlibs/win32unix/winworker.c
index f8ef33e1f..bcd5947ae 100644
--- a/otherlibs/win32unix/winworker.c
+++ b/otherlibs/win32unix/winworker.c
@@ -11,10 +11,10 @@
/* */
/***********************************************************************/
-#include <mlvalues.h>
-#include <alloc.h>
-#include <memory.h>
-#include <signals.h>
+#include <caml/mlvalues.h>
+#include <caml/alloc.h>
+#include <caml/memory.h>
+#include <caml/signals.h>
#include "winworker.h"
#include "winlist.h"
#include "windbug.h"
diff --git a/otherlibs/win32unix/write.c b/otherlibs/win32unix/write.c
index 65f82ccb5..dc0ae91b7 100644
--- a/otherlibs/win32unix/write.c
+++ b/otherlibs/win32unix/write.c
@@ -13,9 +13,9 @@
#include <errno.h>
#include <string.h>
-#include <mlvalues.h>
-#include <memory.h>
-#include <signals.h>
+#include <caml/mlvalues.h>
+#include <caml/memory.h>
+#include <caml/signals.h>
#include "unixsupport.h"
CAMLprim value unix_write(value fd, value buf, value vofs, value vlen)