diff -x '*.cmi' -uwNr ../ocaml-3.10.2/stdlib/filename.ml ./stdlib/filename.ml
--- ../ocaml-3.10.2/stdlib/filename.ml	2007-01-09 14:42:17.000000000 +0100
+++ ./stdlib/filename.ml	2008-03-26 14:35:18.000000000 +0100
@@ -60,6 +60,8 @@
                     (String.length suff) = suff
   let temp_dir_name =
     try Sys.getenv "TMPDIR" with Not_found -> "/tmp"
+  let temp_dir_name_2 () =
+    try Sys.getenv "TMPDIR" with Not_found -> "/tmp"
   let quote = generic_quote "'\\''"
   let basename = generic_basename rindex_dir_sep current_dir_name
   let dirname = generic_dirname rindex_dir_sep current_dir_name dir_sep
@@ -93,6 +95,8 @@
     String.lowercase s = String.lowercase suff)
   let temp_dir_name =
     try Sys.getenv "TEMP" with Not_found -> "."
+  let temp_dir_name_2 () =
+    try Sys.getenv "TEMP" with Not_found -> "."
   let quote s =
     let l = String.length s in
     let b = Buffer.create (l + 20) in
@@ -143,30 +147,31 @@
   let is_implicit = Win32.is_implicit
   let check_suffix = Win32.check_suffix
   let temp_dir_name = Unix.temp_dir_name
+  let temp_dir_name_2 = Unix.temp_dir_name_2
   let quote = Unix.quote
   let basename = generic_basename rindex_dir_sep current_dir_name
   let dirname = generic_dirname rindex_dir_sep current_dir_name dir_sep
 end
 
 let (current_dir_name, parent_dir_name, dir_sep, is_dir_sep, rindex_dir_sep,
-     is_relative, is_implicit, check_suffix, temp_dir_name, quote, basename,
+     is_relative, is_implicit, check_suffix, temp_dir_name, temp_dir_name_2, quote, basename,
      dirname) =
   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.temp_dir_name, Unix.quote, Unix.basename, Unix.dirname)
+       Unix.temp_dir_name, Unix.temp_dir_name_2, Unix.quote, Unix.basename, Unix.dirname)
   | "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.temp_dir_name, Win32.quote, Win32.basename, Win32.dirname)
+       Win32.temp_dir_name, Win32.temp_dir_name_2, Win32.quote, Win32.basename, Win32.dirname)
   | "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.temp_dir_name, Cygwin.quote, Cygwin.basename, Cygwin.dirname)
+       Cygwin.temp_dir_name, Cygwin.temp_dir_name_2, Cygwin.quote, Cygwin.basename, Cygwin.dirname)
   | _ -> assert false
 
 let concat dirname filename =
@@ -193,7 +198,7 @@
 
 let temp_file_name prefix suffix =
   let rnd = (Random.State.bits prng) land 0xFFFFFF in
-  concat temp_dir_name (Printf.sprintf "%s%06x%s" prefix rnd suffix)
+  concat (temp_dir_name_2 ()) (Printf.sprintf "%s%06x%s" prefix rnd suffix)
 ;;
 
 let temp_file prefix suffix =
diff -x '*.cmi' -uwNr ../ocaml-3.10.2/stdlib/filename.mli ./stdlib/filename.mli
--- ../ocaml-3.10.2/stdlib/filename.mli	2007-01-09 14:42:17.000000000 +0100
+++ ./stdlib/filename.mli	2008-03-26 14:35:59.000000000 +0100
@@ -98,6 +98,15 @@
     if the variable is not set.
 *)
 
+val temp_dir_name_2 : unit -> string
+(** The name of the temporary directory:
+    Under Unix, the value of the [TMPDIR] environment variable, or "/tmp"
+    if the variable is not set.
+    Under Windows, the value of the [TEMP] environment variable, or "."
+    if the variable is not set.
+    This function respects run-time changes to environment variables
+*)
+
 val quote : string -> string
 (** Return a quoted version of a file name, suitable for use as
     one argument in a command line, escaping all meta-characters.