1 From: Christopher Cramer <tsuyoshi@yumegakanau.org>
2 Date: Thu, 21 Nov 2019 13:27:08 +0100
3 Subject: Fix compilation with OCaml 4.08.1
5 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=944593
7 src/pxp-engine/pxp_lexing.mli | 6 +++---
8 tools/src/odoc/Makefile | 2 +-
9 tools/src/odoc/chtml_ocaml4.ml | 2 +-
10 3 files changed, 5 insertions(+), 5 deletions(-)
12 diff --git a/src/pxp-engine/pxp_lexing.mli b/src/pxp-engine/pxp_lexing.mli
13 index 5dc3497..ffa6e34 100644
14 --- a/src/pxp-engine/pxp_lexing.mli
15 +++ b/src/pxp-engine/pxp_lexing.mli
18 type lexbuf = Lexing.lexbuf
20 -val from_channel : in_channel -> lexbuf
21 +val from_channel : ?with_positions:bool -> in_channel -> lexbuf
23 -val from_string : string -> lexbuf
24 +val from_string : ?with_positions:bool -> string -> lexbuf
26 -val from_function : (Bytes.t -> int -> int) -> lexbuf
27 +val from_function : ?with_positions:bool -> (Bytes.t -> int -> int) -> lexbuf
29 val lexeme : lexbuf -> string
31 diff --git a/tools/src/odoc/Makefile b/tools/src/odoc/Makefile
32 index 071bf8d..67dbeb4 100644
33 --- a/tools/src/odoc/Makefile
34 +++ b/tools/src/odoc/Makefile
35 @@ -3,7 +3,7 @@ include $(TOP_DIR)/Makefile.rules
39 -OCAMLC_OPTIONS += -I +ocamldoc
40 +OCAMLC_OPTIONS += -I +ocamldoc -I +compiler-libs
41 CLEAN_LIST += chtml.ml
44 diff --git a/tools/src/odoc/chtml_ocaml4.ml b/tools/src/odoc/chtml_ocaml4.ml
45 index dbf8caf..667930f 100644
46 --- a/tools/src/odoc/chtml_ocaml4.ml
47 +++ b/tools/src/odoc/chtml_ocaml4.ml
48 @@ -34,7 +34,7 @@ open Printf
52 -module StringSet = Odoc_html.StringSet
53 +module StringSet = Odoc_html.String.Set
56 let word_re = Str.regexp "[ \t\r\n]+"