Skip to content

Some fixes to make it build with ocaml 5 #3

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

Open
jahierwan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Some fixes to make it build with ocaml 5 #3

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
2 changes: 1 addition & 1 deletion Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ EXE = @EXE@
LIBEXT = @LIBEXT@
OBJEXT = @OBJEXT@

INCLUDES =
INCLUDES = @OCAMLINCLUDE@
BFLAGS = -dtypes -g $(INCLUDES)
OFLAGS = -dtypes $(INCLUDES) -for-pack Functory

Expand Down
3 changes: 3 additions & 0 deletions configure.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ echo "ocaml library path is $OCAMLLIB"
case $OCAMLVERSION in
0.*|1.*|2.*|3.*|4.00*|4.01*)
AC_MSG_ERROR(You need OCaml 4.02 or higher);;
5.*)
OCAMLINCLUDE="-I +unix";;
esac


Expand Down Expand Up @@ -173,6 +175,7 @@ AC_SUBST(OCAMLVERSION)
AC_SUBST(OCAMLLIB)
AC_SUBST(OCAMLWEB)
AC_SUBST(OCAMLWIN32)
AC_SUBST(OCAMLINCLUDE)
AC_SUBST(EXE)
AC_SUBST(LIBEXT)
AC_SUBST(OBJEXT)
Expand Down
2 changes: 1 addition & 1 deletion network.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ end = struct
module S =
Set.Make(struct
type t = worker
let compare w1 w2 = Pervasives.compare w1.worker_id w2.worker_id
let compare w1 w2 = Stdlib.compare w1.worker_id w2.worker_id
end)
type t = S.t ref
let create () = ref S.empty
Expand Down