From 3ccc745b75e85c8e1fd130f898b2d082ec7a8346 Mon Sep 17 00:00:00 2001
From: Gabriel Scherer <gabriel.scherer@gmail.com>
Date: May 28 2013 12:16:10 +0000
Subject: turn more (or) into (||) to please the new warning



git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13708 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

---

diff --git a/ocamlbuild/glob.ml b/ocamlbuild/glob.ml
index 421ba73..0bfa61f 100644
--- a/ocamlbuild/glob.ml
+++ b/ocamlbuild/glob.ml
@@ -257,7 +257,7 @@ module Brute =
         | Word v   ->
             String.length v = n &&
             begin
-              let rec check j = j = n or (v.[j] = u.[i + j] && check (j + 1))
+              let rec check j = j = n || (v.[j] = u.[i + j] && check (j + 1))
               in
               check 0
             end
diff --git a/ocamlbuild/my_std.ml b/ocamlbuild/my_std.ml
index 764341b..8de751f 100644
--- a/ocamlbuild/my_std.ml
+++ b/ocamlbuild/my_std.ml
@@ -195,7 +195,7 @@ module String = struct
     and n = String.length v
     in
     m <= n &&
-      let rec loop i = i = m or u.[i] = v.[i] && loop (i + 1) in
+      let rec loop i = i = m || u.[i] = v.[i] && loop (i + 1) in
       loop 0
   (* ***)
 
@@ -205,7 +205,7 @@ module String = struct
     and n = String.length v
     in
     n <= m &&
-      let rec loop i = i = n or u.[m - 1 - i] = v.[n - 1 - i] && loop (i + 1) in
+      let rec loop i = i = n || u.[m - 1 - i] = v.[n - 1 - i] && loop (i + 1) in
       loop 0
   (* ***)
 
diff --git a/ocamlbuild/plugin.ml b/ocamlbuild/plugin.ml
index 586b1ce..97500e6 100644
--- a/ocamlbuild/plugin.ml
+++ b/ocamlbuild/plugin.ml
@@ -51,8 +51,8 @@ module Make(U:sig end) =
 
     let rebuild_plugin_if_needed () =
       let a = up_to_date_or_copy plugin_file in
-      let b = (not we_have_a_config_file) or up_to_date_or_copy plugin_config_file in
-      let c = (not we_have_a_config_file_interface) or up_to_date_or_copy plugin_config_file_interface in
+      let b = (not we_have_a_config_file) || up_to_date_or_copy plugin_config_file in
+      let c = (not we_have_a_config_file_interface) || up_to_date_or_copy plugin_config_file_interface in
       if a && b && c && we_have_a_plugin then
         () (* Up to date *)
            (* FIXME: remove ocamlbuild_config.ml in _build/ if removed in parent *)