aboutsummaryrefslogtreecommitdiff
path: root/net/unison248/files/patch-ocaml8
diff options
context:
space:
mode:
Diffstat (limited to 'net/unison248/files/patch-ocaml8')
-rw-r--r--net/unison248/files/patch-ocaml852
1 files changed, 52 insertions, 0 deletions
diff --git a/net/unison248/files/patch-ocaml8 b/net/unison248/files/patch-ocaml8
new file mode 100644
index 000000000000..446c260564d7
--- /dev/null
+++ b/net/unison248/files/patch-ocaml8
@@ -0,0 +1,52 @@
+From 23fa129254a3304902739fc989950cc747d1e0b3 Mon Sep 17 00:00:00 2001
+From: Jaap Boender <jaapb@kerguelen.org>
+Date: Thu, 21 Mar 2019 12:26:51 +0000
+Subject: [PATCH] Compatibility with OCaml 4.08
+
+---
+ src/files.ml | 2 +-
+ src/recon.ml | 4 ++--
+ src/system/system_generic.ml | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/files.ml b/src/files.ml
+index 72cd33875..bc162b12e 100644
+--- files.ml
++++ files.ml
+@@ -734,7 +734,7 @@ let get_files_in_directory dir =
+ with End_of_file ->
+ dirh.System.closedir ()
+ end;
+- Sort.list (<) !files
++ List.sort String.compare !files
+
+ let ls dir pattern =
+ Util.convertUnixErrorsToTransient
+diff --git a/src/recon.ml b/src/recon.ml
+index 490baf15a..7a6186bb8 100644
+--- recon.ml
++++ recon.ml
+@@ -662,8 +662,8 @@ let rec reconcile
+
+ (* Sorts the paths so that they will be displayed in order *)
+ let sortPaths pathUpdatesList =
+- Sort.list
+- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
++ List.sort
++ Path.compare
+ pathUpdatesList
+
+ let rec enterPath p1 p2 t =
+diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml
+index 453027d06..c2288b82b 100755
+--- system/system_generic.ml
++++ system/system_generic.ml
+@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
+ let chmod = Unix.chmod
+ let chown = Unix.chown
+ let utimes = Unix.utimes
+-let link = Unix.link
++let link s d = Unix.link s d
+ let openfile = Unix.openfile
+ let opendir f =
+ let h = Unix.opendir f in