Skip to content

Commit cd4aadd

Browse files
committed
Include lwt_config.h before and lwt_unix.h after caml headers
This allows configuring caml headers first, and then overwriting declarations (for compatibility).
1 parent b5a9587 commit cd4aadd

34 files changed

+61
-25
lines changed

src/unix/lwt_libev_stubs.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
/* Stubs for libev */
77

88
#include "lwt_config.h"
9-
#include "lwt_unix.h"
109

1110
#if defined(HAVE_LIBEV)
1211

@@ -21,6 +20,8 @@
2120
#include <caml/signals.h>
2221
#include <ev.h>
2322

23+
#include "lwt_unix.h"
24+
2425
/* +-----------------------------------------------------------------+
2526
| Backend types |
2627
+-----------------------------------------------------------------+ */
@@ -221,6 +222,8 @@ CAMLprim value lwt_libev_timer_stop(value loop, value val_watcher) {
221222

222223
#else
223224

225+
#include "lwt_unix.h"
226+
224227
LWT_NOT_AVAILABLE1(libev_init)
225228
LWT_NOT_AVAILABLE1(libev_stop)
226229
LWT_NOT_AVAILABLE2(libev_loop)

src/unix/unix_c/unix_access_job.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
*/
1717

1818
/* Caml headers. */
19-
#include "lwt_unix.h"
19+
#include "lwt_config.h"
2020
#include <caml/memory.h>
2121
#include <caml/alloc.h>
2222
#include <caml/fail.h>
2323
#include <caml/signals.h>
24+
#include "lwt_unix.h"
2425

2526
#if !defined(LWT_ON_WINDOWS)
2627

src/unix/unix_c/unix_bytes_recv.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <sys/types.h>
1515
#include <sys/socket.h>
1616

17+
#include "lwt_unix.h"
1718
#include "unix_recv_send_utils.h"
1819

1920
value lwt_unix_bytes_recv(value fd, value buf, value ofs, value len,

src/unix/unix_c/unix_bytes_recvfrom.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <sys/types.h>
1717
#include <sys/socket.h>
1818

19+
#include "lwt_unix.h"
1920
#include "unix_recv_send_utils.h"
2021

2122
value lwt_unix_bytes_recvfrom(value fd, value buf, value ofs, value len,

src/unix/unix_c/unix_bytes_send.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <sys/types.h>
1515
#include <sys/socket.h>
1616

17+
#include "lwt_unix.h"
1718
#include "unix_recv_send_utils.h"
1819

1920
value lwt_unix_bytes_send(value fd, value buf, value ofs, value len,

src/unix/unix_c/unix_bytes_sendto.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <sys/types.h>
1616
#include <sys/socket.h>
1717

18+
#include "lwt_unix.h"
1819
#include "unix_recv_send_utils.h"
1920

2021
value lwt_unix_bytes_sendto(value fd, value buf, value ofs, value len,

src/unix/unix_c/unix_chdir_job.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
*/
1717

1818
/* Caml headers. */
19-
#include "lwt_unix.h"
19+
#include "lwt_config.h"
2020
#include <caml/memory.h>
2121
#include <caml/alloc.h>
2222
#include <caml/fail.h>
2323
#include <caml/signals.h>
24+
#include "lwt_unix.h"
2425

2526
#if !defined(LWT_ON_WINDOWS)
2627

src/unix/unix_c/unix_chmod_job.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
*/
1717

1818
/* Caml headers. */
19-
#include "lwt_unix.h"
19+
#include "lwt_config.h"
2020
#include <caml/memory.h>
2121
#include <caml/alloc.h>
2222
#include <caml/fail.h>
2323
#include <caml/signals.h>
24+
#include "lwt_unix.h"
2425

2526
#if !defined(LWT_ON_WINDOWS)
2627

src/unix/unix_c/unix_chown_job.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
*/
1717

1818
/* Caml headers. */
19-
#include "lwt_unix.h"
19+
#include "lwt_config.h"
2020
#include <caml/memory.h>
2121
#include <caml/alloc.h>
2222
#include <caml/fail.h>
2323
#include <caml/signals.h>
24+
#include "lwt_unix.h"
2425

2526
#if !defined(LWT_ON_WINDOWS)
2627

src/unix/unix_c/unix_chroot_job.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
*/
1717

1818
/* Caml headers. */
19-
#include "lwt_unix.h"
19+
#include "lwt_config.h"
2020
#include <caml/memory.h>
2121
#include <caml/alloc.h>
2222
#include <caml/fail.h>
2323
#include <caml/signals.h>
24+
#include "lwt_unix.h"
2425

2526
#if !defined(LWT_ON_WINDOWS)
2627

0 commit comments

Comments
 (0)