diff options
| author | Jean-Louis Fuchs <ganwell@fangorn.ch> | 2017-04-29 15:08:39 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-05-02 09:41:15 +0000 |
| commit | f5fb4fa4ed695ff1c8eda1971f0d4be46bc85864 (patch) | |
| tree | 604a7c7723529a6826daf1d19145b5187160f3c9 /community/unison/marshalling.patch | |
| parent | 5cc18dc21a87731f5dedce4e6472a1e507c4ad04 (diff) | |
| download | aports-f5fb4fa4ed695ff1c8eda1971f0d4be46bc85864.tar.bz2 aports-f5fb4fa4ed695ff1c8eda1971f0d4be46bc85864.tar.xz | |
community/unison: move from testing, update marshalling patch
Diffstat (limited to 'community/unison/marshalling.patch')
| -rw-r--r-- | community/unison/marshalling.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/community/unison/marshalling.patch b/community/unison/marshalling.patch new file mode 100644 index 0000000000..997b90b513 --- /dev/null +++ b/community/unison/marshalling.patch @@ -0,0 +1,16 @@ +--- a/remote.ml 2016-05-23 18:40:05.000000000 +0200 ++++ b/remote.ml 2017-03-23 11:33:24.784228112 +0100 +@@ -450,12 +450,7 @@ + let s = Bytearray.marshal data [Marshal.No_sharing] in + let l = Bytearray.length s in + ((s, 0, l) :: rem, l)), +- (fun buf pos -> +- try Bytearray.unmarshal buf pos +- with Failure s -> raise (Util.Fatal (Printf.sprintf +-"Fatal error during unmarshaling (%s), +-possibly because client and server have been compiled with different\ +-versions of the OCaml compiler." s))) ++ (fun buf pos -> Bytearray.unmarshal buf pos) + + let makeMarshalingFunctions payloadMarshalingFunctions string = + let (marshalPayload, unmarshalPayload) = payloadMarshalingFunctions in |