Don't define CAML_NAME_SPACE on OCaml 5.00

ocsigen · Feb 4, 2022 · dab566f · dab566f
1 parent 1edb00f
commit dab566f
Show file tree

Hide file tree

Showing 33 changed files with 5 additions and 36 deletions.
diff --git a/src/unix/lwt_config.h b/src/unix/lwt_config.h
@@ -26,4 +26,9 @@
 #define NANOSEC(buf, field) 0.0
 #endif
 
+#include <caml/version.h>
+#if OCAML_VERSION < 50000
+#define CAML_NAME_SPACE
+#endif
+
 #endif // #ifndef _LWT_CONFIG_H_
diff --git a/src/unix/lwt_libev_stubs.c b/src/unix/lwt_libev_stubs.c
@@ -10,8 +10,6 @@
 
 #if defined(HAVE_LIBEV)
 
-#define CAML_NAME_SPACE
-
 #include <assert.h>
 
 #include <caml/alloc.h>

diff --git a/src/unix/lwt_process_stubs.c b/src/unix/lwt_process_stubs.c
@@ -9,8 +9,6 @@
 
 #include <lwt_unix.h>
 
-#define CAML_NAME_SPACE
-#include <caml/version.h>
 #if OCAML_VERSION < 41300
 #define CAML_INTERNALS
 #endif

diff --git a/src/unix/lwt_unix_stubs.c b/src/unix/lwt_unix_stubs.c
@@ -8,8 +8,6 @@
 #define _GNU_SOURCE
 #define _POSIX_PTHREAD_SEMANTICS
 
-#define CAML_NAME_SPACE
-
 #include <caml/alloc.h>
 #include <caml/bigarray.h>
 #include <caml/callback.h>

diff --git a/src/unix/unix_c/unix_access_job.c b/src/unix/unix_c/unix_access_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_chdir_job.c b/src/unix/unix_c/unix_chdir_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_chmod_job.c b/src/unix/unix_c/unix_chmod_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_chown_job.c b/src/unix/unix_c/unix_chown_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_chroot_job.c b/src/unix/unix_c/unix_chroot_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_close_job.c b/src/unix/unix_c/unix_close_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_fchmod_job.c b/src/unix/unix_c/unix_fchmod_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_fchown_job.c b/src/unix/unix_c/unix_fchown_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_fdatasync_job.c b/src/unix/unix_c/unix_fdatasync_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_fsync_job.c b/src/unix/unix_c/unix_fsync_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_ftruncate_job.c b/src/unix/unix_c/unix_ftruncate_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_link_job.c b/src/unix/unix_c/unix_link_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_lseek_job.c b/src/unix/unix_c/unix_lseek_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_mkdir_job.c b/src/unix/unix_c/unix_mkdir_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_mkfifo_job.c b/src/unix/unix_c/unix_mkfifo_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_pread_job.c b/src/unix/unix_c/unix_pread_job.c
@@ -11,7 +11,6 @@
 #include <caml/memory.h>
 #include <caml/mlvalues.h>
 #include <caml/unixsupport.h>
-#include <caml/version.h>
 #include <errno.h>
 #include <string.h>
 

diff --git a/src/unix/unix_c/unix_read_job.c b/src/unix/unix_c/unix_read_job.c
@@ -11,7 +11,6 @@
 #include <caml/memory.h>
 #include <caml/mlvalues.h>
 #include <caml/unixsupport.h>
-#include <caml/version.h>
 #include <errno.h>
 #include <string.h>
 

diff --git a/src/unix/unix_c/unix_rename_job.c b/src/unix/unix_c/unix_rename_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_rmdir_job.c b/src/unix/unix_c/unix_rmdir_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_symlink_job.c b/src/unix/unix_c/unix_symlink_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_tcdrain_job.c b/src/unix/unix_c/unix_tcdrain_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_tcflow_job.c b/src/unix/unix_c/unix_tcflow_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_tcflush_job.c b/src/unix/unix_c/unix_tcflush_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_tcsendbreak_job.c b/src/unix/unix_c/unix_tcsendbreak_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_truncate_job.c b/src/unix/unix_c/unix_truncate_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/unix_c/unix_unlink_job.c b/src/unix/unix_c/unix_unlink_job.c
@@ -16,7 +16,6 @@
 */
 
 /* Caml headers. */
-#define CAML_NAME_SPACE
 #include <lwt_unix.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>

diff --git a/src/unix/windows_c/windows_pread_job.c b/src/unix/windows_c/windows_pread_job.c
@@ -11,7 +11,6 @@
 #include <caml/memory.h>
 #include <caml/mlvalues.h>
 #include <caml/unixsupport.h>
-#include <caml/version.h>
 
 #include "lwt_unix.h"
 

diff --git a/src/unix/windows_c/windows_read_job.c b/src/unix/windows_c/windows_read_job.c
@@ -10,7 +10,6 @@
 #include <caml/memory.h>
 #include <caml/mlvalues.h>
 #include <caml/unixsupport.h>
-#include <caml/version.h>
 
 #include "lwt_unix.h"
 

diff --git a/src/unix/windows_c/windows_system_job.c b/src/unix/windows_c/windows_system_job.c
@@ -7,8 +7,6 @@
 
 #if defined(LWT_ON_WINDOWS)
 
-#define CAML_NAME_SPACE
-#include <caml/version.h>
 #if OCAML_VERSION < 41300
 #define CAML_INTERNALS
 #endif