Changeset 6672

Timestamp:

06/20/09 16:00:08 (15 months ago)

Author:

metamorph68

Message:

Merged latest changes from trunk

Location:

branches/bugfix-0.9.1/src

Files:

• main.ml (modified) (1 diff, 1 prop)
• tools/tutils.ml (modified) (1 diff, 1 prop)

branches/bugfix-0.9.1/src/main.ml

@@ -366 +366 @@
                   Printf.printf
                     "Liquidsoap %s%s.\n\
-                     Copyright (c) 2003-2008 Savonet team\n\
+                     Copyright (c) 2003-2009 Savonet team\n\
                      Liquidsoap is open-source software, \
                      released under GNU General Public License.\n\

branches/bugfix-0.9.1/src/tools/tutils.ml

@@ -218 +218 @@
   let in_stderr = reopen Unix.stderr in
   (* Without the eta-expansion, the timestamp is computed once for all. *)
-  let log_stdout s = (Log.make ["stdout"])#f 3 "%s" s in
-  let log_stderr s = (Log.make ["stderr"])#f 3 "%s" s in
+  let log_stdout =
+    let log = Log.make ["stdout"] in
+      fun s -> log#f 3 "%s" s
+  in
+  let log_stderr =
+    let log = Log.make ["stderr"] in
+      fun s -> log#f 3 "%s" s
+  in
   let forward fd log =
     let task f =