[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/utils/cdk/unix2.ml
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/utils/cdk/unix2.ml |
Date: |
Thu, 06 Apr 2006 21:51:40 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Branch:
Changes by: spiralvoice <address@hidden> 06/04/06 21:51:40
Modified files:
distrib : ChangeLog
src/utils/cdk : unix2.ml
Log message:
patch #5021
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.788&tr2=1.789&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/cdk/unix2.ml.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.788 mldonkey/distrib/ChangeLog:1.789
--- mldonkey/distrib/ChangeLog:1.788 Thu Apr 6 21:47:55 2006
+++ mldonkey/distrib/ChangeLog Thu Apr 6 21:51:40 2006
@@ -15,6 +15,7 @@
=========
2006/04/06
+5021: Fix compile bug in tryopen patch when bzip2 is disabled
5020: Allow compile with Ocaml 3.09.2 CVS code,
3.09.1 will stay default for MLDonkey-compiled Ocaml
5016: Options save: Really fix bug addressed in patch #5015
Index: mldonkey/src/utils/cdk/unix2.ml
diff -u mldonkey/src/utils/cdk/unix2.ml:1.27
mldonkey/src/utils/cdk/unix2.ml:1.28
--- mldonkey/src/utils/cdk/unix2.ml:1.27 Mon Apr 3 21:34:07 2006
+++ mldonkey/src/utils/cdk/unix2.ml Thu Apr 6 21:51:40 2006
@@ -52,11 +52,7 @@
tryopen Gzip.open_in Gzip.close_in fn f
let tryopen_write_gzip ?level fn f =
tryopen (Gzip.open_out ?level) Gzip.close_out fn f
-let tryopen_read_bzip2 fn f =
- tryopen Bzip2.open_in Bzip2.close_in fn f
-let tryopen_write_bzip2 ?level fn f =
- tryopen (Bzip2.open_out ?level) Bzip2.close_out fn f
-
+
let list_directory filename =
let list = ref [] in
tryopen_dir filename (fun dir ->