3.09.1 updategcaml3090

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

1 files changed, 8 insertions, 8 deletions

diff --git a/stdlib/filename.ml b/stdlib/filename.ml
index 62cb63951d..d6c24fc1b3 100644
--- a/stdlib/filename.ml
+++ b/stdlib/filename.ml
@@ -40,7 +40,7 @@ module Unix = struct
     String.length name >= String.length suff &&
     String.sub name (String.length name - String.length suff)
                     (String.length suff) = suff
-  let temporary_directory =
+  let temp_dir_name =
     try Sys.getenv "TMPDIR" with Not_found -> "/tmp"
   let quote = generic_quote "'\\''"
 end
@@ -71,7 +71,7 @@ module Win32 = struct
    (let s = String.sub name (String.length name - String.length suff)
                             (String.length suff) in
     String.lowercase s = String.lowercase suff)
-  let temporary_directory =
+  let temp_dir_name =
     try Sys.getenv "TEMP" with Not_found -> "."
   let quote s =
     let l = String.length s in
@@ -98,28 +98,28 @@ module Cygwin = struct
   let is_relative = Win32.is_relative
   let is_implicit = Win32.is_implicit
   let check_suffix = Win32.check_suffix
-  let temporary_directory = Unix.temporary_directory
+  let temp_dir_name = Unix.temp_dir_name
   let quote = Unix.quote
 end
 
 let (current_dir_name, parent_dir_name, dir_sep, is_dir_sep, rindex_dir_sep,
-     is_relative, is_implicit, check_suffix, temporary_directory, quote) =
+     is_relative, is_implicit, check_suffix, temp_dir_name, quote) =
   match Sys.os_type with
     "Unix" ->
       (Unix.current_dir_name, Unix.parent_dir_name, Unix.dir_sep,
        Unix.is_dir_sep, Unix.rindex_dir_sep,
        Unix.is_relative, Unix.is_implicit, Unix.check_suffix,
-       Unix.temporary_directory, Unix.quote)
+       Unix.temp_dir_name, Unix.quote)
   | "Win32" ->
       (Win32.current_dir_name, Win32.parent_dir_name, Win32.dir_sep,
        Win32.is_dir_sep, Win32.rindex_dir_sep,
        Win32.is_relative, Win32.is_implicit, Win32.check_suffix,
-       Win32.temporary_directory, Win32.quote)
+       Win32.temp_dir_name, Win32.quote)
   | "Cygwin" ->
       (Cygwin.current_dir_name, Cygwin.parent_dir_name, Cygwin.dir_sep,
        Cygwin.is_dir_sep, Cygwin.rindex_dir_sep,
        Cygwin.is_relative, Cygwin.is_implicit, Cygwin.check_suffix,
-       Cygwin.temporary_directory, Cygwin.quote)
+       Cygwin.temp_dir_name, Cygwin.quote)
   | _ -> assert false
 
 let concat dirname filename =
@@ -164,7 +164,7 @@ let prng = Random.State.make_self_init ();;
 
 let temp_file_name prefix suffix =
   let rnd = (Random.State.bits prng) land 0xFFFFFF in
-  concat temporary_directory (Printf.sprintf "%s%06x%s" prefix rnd suffix)
+  concat temp_dir_name (Printf.sprintf "%s%06x%s" prefix rnd suffix)
 ;;
 
 let temp_file prefix suffix =