[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/01/04 14:24:00

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonOptions.ml 
        src/utils/lib  : CryptoPP.h stubs_c.c 

Log message:
        patch #4757

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.651&tr2=1.652&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonOptions.ml.diff?tr1=1.114&tr2=1.115&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/CryptoPP.h.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/stubs_c.c.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.651 mldonkey/distrib/ChangeLog:1.652
--- mldonkey/distrib/ChangeLog:1.651    Wed Jan  4 14:11:55 2006
+++ mldonkey/distrib/ChangeLog  Wed Jan  4 14:24:00 2006
@@ -12,6 +12,7 @@
 http://mldonkey.berlios.de/modules.php?name=Wiki&pagename=Windows
 
 2006/01/04
+4757: Compile patches for MorphOS (Christian Rosentreter)
 4748: HTML: Allow rename of files with '#', '&' and '%',
       remove invalid chars from filenames depending on OS (thx to pango)
 4756: HTML: Print build- and runinfo on main page,
Index: mldonkey/src/daemon/common/commonOptions.ml
diff -u mldonkey/src/daemon/common/commonOptions.ml:1.114 
mldonkey/src/daemon/common/commonOptions.ml:1.115
--- mldonkey/src/daemon/common/commonOptions.ml:1.114   Tue Jan  3 18:41:40 2006
+++ mldonkey/src/daemon/common/commonOptions.ml Wed Jan  4 14:24:00 2006
@@ -125,7 +125,7 @@
   Unix.chdir file_basedir;
 
   if (String2.starts_with (Filename.basename Sys.argv.(0)) "mlnet")
-    && not Autoconf.windows && not (Sys.file_exists "/dev/urandom") then begin
+    && not Autoconf.windows && not (Autoconf.system = "morphos") && not 
(Sys.file_exists "/dev/urandom") then begin
       lprintf "%s" (exit_message_dev "urandom");
       if Autoconf.system = "hpux" then
         lprintf_nl "For HP-UX get urandom support from 
http://www.josvisser.nl/hpux11-random";;
Index: mldonkey/src/utils/lib/CryptoPP.h
diff -u mldonkey/src/utils/lib/CryptoPP.h:1.5 
mldonkey/src/utils/lib/CryptoPP.h:1.6
--- mldonkey/src/utils/lib/CryptoPP.h:1.5       Sat Dec  3 16:19:55 2005
+++ mldonkey/src/utils/lib/CryptoPP.h   Wed Jan  4 14:24:00 2006
@@ -87,6 +87,7 @@
 
 #include <inttypes.h>
 #include <caml/config.h>
+#include <stdio.h>
 
 
////////////////////////////////////////////////////////////////////////////////
 #ifndef CRYPTOPP_CONFIG_H5392
@@ -286,7 +287,7 @@
 #define CRYPTOPP_WIN32_AVAILABLE
 #endif
 
-#if defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || 
defined(__BEOS__)
+#if defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || 
defined(__BEOS__) || defined(__MORPHOS__)
 #define CRYPTOPP_UNIX_AVAILABLE
 #endif
 
Index: mldonkey/src/utils/lib/stubs_c.c
diff -u mldonkey/src/utils/lib/stubs_c.c:1.29 
mldonkey/src/utils/lib/stubs_c.c:1.30
--- mldonkey/src/utils/lib/stubs_c.c:1.29       Wed Dec 28 21:33:24 2005
+++ mldonkey/src/utils/lib/stubs_c.c    Wed Jan  4 14:24:00 2006
@@ -24,6 +24,9 @@
 #include <ctype.h>
 #include <caml/config.h>
 #include <caml/signals.h>
+#ifdef __MORPHOS__
+#include <inttypes.h>
+#endif
 
 #define lseek XXXXXXXXX
 #define read XXXXXXXXX