Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix OCaml 4.12 support (port breaking change https://github.com/ocaml/ocaml/pull/10073) #826

Merged
merged 1 commit into from
Dec 9, 2020
Merged

Fix OCaml 4.12 support (port breaking change https://github.com/ocaml/ocaml/pull/10073) #826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) =====

Expand Down
6 changes: 3 additions & 3 deletions src/unix/lwt_unix.cppo.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
6 changes: 3 additions & 3 deletions src/unix/lwt_unix.cppo.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down