whitespace cleanup, cut long lines, add some missing headers

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

4 files changed, 12 insertions, 11 deletions

diff --git a/tools/check-typo b/tools/check-typo
index bd48dc7a3e..a28e4dc153 100755
--- a/tools/check-typo
+++ b/tools/check-typo
@@ -194,7 +194,7 @@ IGNORE_DIRS="
         }
 
         3 <= NR && NR <= 5 \
-        && (/ OCaml / || / ocamlbuild / || / OCamldoc /) {
+        && (/  OCaml  / || / ocamlbuild / || / OCamldoc /) {
           header_ocaml = NR;
         }
 
diff --git a/tools/gdb-macros b/tools/gdb-macros
index 5dfa2b2ed0..157bfe2e4f 100644
--- a/tools/gdb-macros
+++ b/tools/gdb-macros
@@ -163,7 +163,7 @@ define camlblock
   set $mysize = $size
   set $camlnext = $arg0 + $camlwordsize * ($size + 1)
   printf "\n"
-  
+
   if $tag == 252
     x/s $arg0
   end
@@ -209,7 +209,7 @@ define camlblock
       if ($field & 1) == 1
         camlint $field
       end
-      printf "\n"        
+      printf "\n"
       set $count = $count + 1
     end
     if $count < $mysize
diff --git a/tools/ocamldep.ml b/tools/ocamldep.ml
index c57521d22f..94fda41c0a 100644
--- a/tools/ocamldep.ml
+++ b/tools/ocamldep.ml
@@ -276,11 +276,11 @@ let read_parse_and_extract parse_function extract_function magic source_file =
     begin try
       let ast =
         Pparse.file ~tool_name Format.err_formatter
-		    input_file parse_function magic
+                    input_file parse_function magic
       in
       let bound_vars = Depend.StringSet.empty in
       List.iter (fun modname ->
-	Depend.open_module bound_vars (Longident.Lident modname)
+        Depend.open_module bound_vars (Longident.Lident modname)
       ) !Clflags.open_modules;
       extract_function bound_vars ast;
       Pparse.remove_preprocessed input_file;
diff --git a/tools/ocamlmklib.ml b/tools/ocamlmklib.ml
index a4cb697845..69cb0452fa 100644
--- a/tools/ocamlmklib.ml
+++ b/tools/ocamlmklib.ml
@@ -20,15 +20,15 @@ let compiler_path name =
 
 let bytecode_objs = ref []  (* .cmo,.cma,.ml,.mli files to pass to ocamlc *)
 and native_objs = ref []    (* .cmx,.cmxa,.ml,.mli files to pass to ocamlopt *)
-and c_objs = ref []         (* .o, .a, .obj, .lib, .dll, .dylib, .so files to pass
-                               to mksharedlib and ar *)
+and c_objs = ref []         (* .o, .a, .obj, .lib, .dll, .dylib, .so files to
+                               pass to mksharedlib and ar *)
 and caml_libs = ref []      (* -cclib to pass to ocamlc, ocamlopt *)
 and caml_opts = ref []      (* -ccopt to pass to ocamlc, ocamlopt *)
 and dynlink = ref supports_shared_libraries
 and failsafe = ref false    (* whether to fall back on static build only *)
 and c_libs = ref []         (* libs to pass to mksharedlib and ocamlc -cclib *)
-and c_Lopts = ref []        (* options to pass to mksharedlib and ocamlc -cclib *)
-and c_opts = ref []         (* options to pass to mksharedlib and ocamlc -ccopt *)
+and c_Lopts = ref []      (* options to pass to mksharedlib and ocamlc -cclib *)
+and c_opts = ref []       (* options to pass to mksharedlib and ocamlc -ccopt *)
 and ld_opts = ref []        (* options to pass only to the linker *)
 and ocamlc = ref (compiler_path "ocamlc")
 and ocamlc_opts = ref []    (* options to pass only to ocamlc *)
@@ -76,7 +76,7 @@ let parse_arguments argv =
      (bytecode_objs := s :: !bytecode_objs;
       native_objs := s :: !native_objs)
     else if List.exists (ends_with s)
-	[".o"; ".a"; ".obj"; ".lib"; ".dll"; ".dylib"; ".so"]
+                        [".o"; ".a"; ".obj"; ".lib"; ".dll"; ".dylib"; ".so"]
     then
       c_objs := s :: !c_objs
     else if s = "-cclib" then
@@ -263,7 +263,8 @@ let build_libs () =
   end;
   if !bytecode_objs <> [] then
     scommand
-      (sprintf "%s -a %s %s %s -o %s.cma %s %s -dllib -l%s -cclib -l%s %s %s %s %s"
+      (sprintf "%s -a %s %s %s -o %s.cma %s %s -dllib -l%s -cclib -l%s \
+                   %s %s %s %s"
                   (transl_path !ocamlc)
                   (if !debug then "-g" else "")
                   (if !dynlink then "" else "-custom")