From cd45cde7e27a88ba170575f48ef07f11a07cf38e Mon Sep 17 00:00:00 2001 From: Jean-Christophe Filliatre Date: Fri, 23 Mar 2018 09:35:17 +0100 Subject: [PATCH] new release 0.6 fixed compilation with OCaml 4.06 now requires OCaml >= 4.02 --- CHANGES | 2 ++ Makefile.in | 2 +- configure.in | 4 ++-- network.ml | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 2365dc5..0887b29 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,6 @@ +version 0.6, March 23, 2018 +--------------------------- o fixed compilation with OCaml 4.06 (using Bytes instead of String) (contributed by haselwarter@github) diff --git a/Makefile.in b/Makefile.in index 8bb62b0..4373e7d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -117,7 +117,7 @@ test.byte: $(CMA) $(TCMO) test.opt: $(CMXA) $(TCMX) $(OCAMLOPT) $(INCLUDES) -o $@ unix.cmxa $^ -VERSION=0.5 +VERSION=0.6 version.ml: Makefile echo "let version = \""$(VERSION)"\"" > version.ml diff --git a/configure.in b/configure.in index 399d31f..bd8921d 100644 --- a/configure.in +++ b/configure.in @@ -65,8 +65,8 @@ OCAMLLIB=`$OCAMLC -v | tail -1 | cut -f 4 -d " "` echo "ocaml library path is $OCAMLLIB" case $OCAMLVERSION in - 0.*|1.*|2.*|3.0**) - AC_MSG_ERROR(Functory requires Ocaml version 3.10.0 or higher);; + 0.*|1.*|2.*|3.*|4.00*|4.01*) + AC_MSG_ERROR(You need OCaml 4.02 or higher);; esac diff --git a/network.ml b/network.ml index c9a6e5b..b1a7aed 100644 --- a/network.ml +++ b/network.ml @@ -404,7 +404,7 @@ let create_sock_addr name port = let addr = try inet_addr_of_string name - with Failure "inet_addr_of_string" -> + with Failure _ -> try (gethostbyname name).h_addr_list.(0) with Not_found ->