Skip to content

Commit 2a73c1f

Browse files
authored
Merge pull request #759 from tleedjarv/old-compat
Remove more of old compiler compatibility code
2 parents af8669b + 15450b0 commit 2a73c1f

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

src/fsmonitor/windows/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ FSMOCAMLOBJS = \
1313
FSMCOBJS = \
1414
bytearray_stubs$(OBJ_EXT) \
1515
system/system_win_stubs$(OBJ_EXT) lwt/lwt_unix_stubs$(OBJ_EXT)
16-
FSMOCAMLLIBS=bigarray.cma unix.cma
16+
FSMOCAMLLIBS=unix.cma
1717

1818
ifeq ($(NATIVE), true)
1919
FSMCAMLOBJS=$(subst .cmo,.cmx, $(FSMOCAMLOBJS))

src/path.ml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -225,12 +225,8 @@ let followPred = Pred.create "follow"
225225
The syntax of \\ARG{pathspec} is \
226226
described in \\sectionref{pathspec}{Path Specification}.")
227227

228-
let winHasReadlink =
229-
Scanf.sscanf Sys.ocaml_version "%d.%d.%d" (fun x y z -> x > 4 || x = 4 && y >= 3)
230-
231228
let followLink path =
232-
(Util.osType = `Unix || Util.isCygwin || winHasReadlink)
233-
&& Pred.test followPred (toString path)
229+
Pred.test followPred (toString path)
234230

235231
let forceLocal p = p
236232
let makeGlobal p = p

0 commit comments

Comments
 (0)