[Mldonkey-commits] mldonkey config/config.h.in config/configure.in...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/10/17 18:27:25

Modified files:
        config         : config.h.in configure.in 
        distrib        : ChangeLog 
        src/utils/lib  : stubs_c.c 

Log message:
        patch #6238

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/config.h.in?cvsroot=mldonkey&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.306&r2=1.307
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1326&r2=1.1327
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/stubs_c.c?cvsroot=mldonkey&r1=1.43&r2=1.44

Patches:
Index: config/config.h.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/config.h.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- config/config.h.in  30 Sep 2007 11:03:42 -0000      1.27
+++ config/config.h.in  17 Oct 2007 18:27:25 -0000      1.28
@@ -115,6 +115,9 @@
 /* Define to 1 if you have the <sys/vfs.h> header file. */
 #undef HAVE_SYS_VFS_H
 
+/* Define to 1 if you have the <sys/statvfs.h> header file. */
+#undef HAVE_SYS_STATVFS_H
+
 /* Define to 1 if you have the <sys/param.h> header file. */
 #undef HAVE_SYS_PARAM_H
 

Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -b -r1.306 -r1.307
--- config/configure.in 4 Oct 2007 00:05:56 -0000       1.306
+++ config/configure.in 17 Oct 2007 18:27:25 -0000      1.307
@@ -725,6 +725,7 @@
 AC_CHECK_FUNCS(poll,,)
 
 AC_CHECK_HEADERS(sys/vfs.h,,)
+AC_CHECK_HEADERS(sys/statvfs.h,,)
 AC_CHECK_HEADERS([sys/param.h sys/mount.h],,,
 [#if HAVE_SYS_PARAM_H
 #include <sys/param.h>

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1326
retrieving revision 1.1327
diff -u -b -r1.1326 -r1.1327
--- distrib/ChangeLog   17 Oct 2007 18:25:02 -0000      1.1326
+++ distrib/ChangeLog   17 Oct 2007 18:27:25 -0000      1.1327
@@ -15,6 +15,7 @@
 =========
 
 2007/10/17
+6238: Fix statvfs code on alpha platform (Alexander Kotelnikov)
 6237: EDK: Load server.met files from archives even if unpack fails
 - http://www.gruk.org/server.met.gz is not a gz archive at the moment...
 

Index: src/utils/lib/stubs_c.c
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/stubs_c.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- src/utils/lib/stubs_c.c     8 Jan 2007 11:02:08 -0000       1.43
+++ src/utils/lib/stubs_c.c     17 Oct 2007 18:27:25 -0000      1.44
@@ -1072,9 +1072,13 @@
 #  define HAVE_STATS 1
 #endif  /* HAVE_SYS_VFS_H */
 
+#ifdef HAVE_SYS_STATVFS_H
+#  include <sys/statvfs.h>
+#endif
+
 #ifdef HAVE_STATS
 static value
-#if ((defined (sun) || defined (__sun__))) || (defined(__NetBSD__) && 
(__NetBSD_Version__ > 299000000)) || defined (__hpux__)
+#if ((defined (sun) || defined (__sun__))) || (defined(__NetBSD__) && 
(__NetBSD_Version__ > 299000000)) || defined (__hpux__) || defined(__alpha__)
 copy_statfs (struct statvfs *buf)
 #else
 copy_statfs (struct statfs *buf)
@@ -1083,7 +1087,7 @@
   CAMLparam0 ();
   CAMLlocal2 (bufv, v);
   bufv = caml_alloc (11, 0);
-#if ((defined (sun) || defined (__sun__))) || (defined(__FreeBSD__) && 
__FreeBSD_version >= 503001) || defined(__OpenBSD__) || defined(__NetBSD__)
+#if ((defined (sun) || defined (__sun__))) || (defined(__FreeBSD__) && 
__FreeBSD_version >= 503001) || defined(__OpenBSD__) || defined(__NetBSD__) || 
defined(__alpha__)
   v = copy_int64 (-1); caml_modify (&Field (bufv, 0), v);
 #else
   v = copy_int64 (buf->f_type); caml_modify (&Field (bufv, 0), v);
@@ -1094,10 +1098,14 @@
   v = copy_int64 (buf->f_bavail); caml_modify (&Field (bufv, 4), v);
   v = copy_int64 (buf->f_files); caml_modify (&Field (bufv, 5), v);
   v = copy_int64 (buf->f_ffree); caml_modify (&Field (bufv, 6), v);
-#if ((defined (sun) || defined (__sun__))) || defined (__hpux__)
+#if ((defined (sun) || defined (__sun__))) || defined (__hpux__) || 
defined(__alpha__)
   v = copy_int64 (-1); caml_modify (&Field (bufv, 7), v);
   v = copy_int64 (buf->f_namemax); caml_modify (&Field (bufv, 8), v);
+# if ! defined(__alpha__)
   v = copy_string (buf->f_basetype); caml_modify (&Field (bufv, 9), v);
+# else
+  v = copy_string ("-1"); caml_modify (&Field (bufv, 9), v);
+# endif
   v = copy_int64 (buf->f_frsize); caml_modify (&Field (bufv, 10), v);
 #else
 #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || 
defined(__APPLE__) || defined(__DragonFly__)
@@ -1126,7 +1134,7 @@
   CAMLparam1 (pathv);
   CAMLlocal1 (bufv);
   const char *path = String_val (pathv);
-#if ((defined (sun) || defined (__sun__))) || (defined(__NetBSD__) && 
(__NetBSD_Version__ > 299000000)) || defined (__hpux__)
+#if ((defined (sun) || defined (__sun__))) || (defined(__NetBSD__) && 
(__NetBSD_Version__ > 299000000)) || defined (__hpux__) || defined(__alpha__)
   struct statvfs buf;
   if (statvfs (path, &buf) == -1)
 #else