Fix OCaml 4.12 support (ocsigen#826)

See ocaml/ocaml#10073.
reynir · Dec 9, 2020 · c0c921a · c0c921a
1 parent 63fd8ae
commit c0c921a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/CHANGES b/CHANGES
@@ -3,6 +3,7 @@
   * Avoid double-reversing when traversing lists. This may change the order in
     which some promises are collected, which may change which of several
     rejection is arbitrarily selected during concurrent traversal.
+  * Add support for OCaml 4.12 (#804, #826, Kate Deplaix)
 
 ===== 5.3.0 (2020-04-22) =====
 

diff --git a/src/unix/lwt_unix.cppo.ml b/src/unix/lwt_unix.cppo.ml
@@ -1821,15 +1821,15 @@ type socket_bool_option =
   | SO_DEBUG
   | SO_BROADCAST
   | SO_REUSEADDR
-#if OCAML_VERSION >= (4, 12, 0)
-  | SO_REUSEPORT
-#endif
   | SO_KEEPALIVE
   | SO_DONTROUTE
   | SO_OOBINLINE
   | SO_ACCEPTCONN
   | TCP_NODELAY
   | IPV6_ONLY
+#if OCAML_VERSION >= (4, 12, 0)
+  | SO_REUSEPORT
+#endif
 
 type socket_int_option =
   Unix.socket_int_option =

diff --git a/src/unix/lwt_unix.cppo.mli b/src/unix/lwt_unix.cppo.mli
@@ -1022,15 +1022,15 @@ type socket_bool_option =
   | SO_DEBUG
   | SO_BROADCAST
   | SO_REUSEADDR
-#if OCAML_VERSION >= (4, 12, 0)
-  | SO_REUSEPORT
-#endif
   | SO_KEEPALIVE
   | SO_DONTROUTE
   | SO_OOBINLINE
   | SO_ACCEPTCONN
   | TCP_NODELAY
   | IPV6_ONLY
+#if OCAML_VERSION >= (4, 12, 0)
+  | SO_REUSEPORT
+#endif
 
 type socket_int_option =
     Unix.socket_int_option =