[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r8710 - gnunet-fuse
From: |
gnunet |
Subject: |
[GNUnet-SVN] r8710 - gnunet-fuse |
Date: |
Thu, 16 Jul 2009 14:16:46 -0600 |
Author: grothoff
Date: 2009-07-16 14:16:46 -0600 (Thu, 16 Jul 2009)
New Revision: 8710
Modified:
gnunet-fuse/configure.ac
gnunet-fuse/directory.c
gnunet-fuse/file.c
gnunet-fuse/main.c
gnunet-fuse/read.c
Log:
Fixing compilation errors --
Von:
Daniel Baumann <address@hidden> (Debian GNU/Linux - The Universal Operating
System)
An:
Kopie:
Christian Grothoff <address@hidden>
Datum:
Heute 14:58:30
Hi,
gnunet-fuse fails to build from source, original bug is #536998.
> Relevant part:
>> gcc -DHAVE_CONFIG_H -I. -DFUSE_USE_VERSION=26 -D_REENTRANT -I/usr/include
>> -g -O2 -Wall -W -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
>> -D_FILE_OFFSET_BITS=64 -I/usr/include/fuse -MT gnunet_fs-directory.o -MD
>> -MP -MF .deps/gnunet_fs-directory.Tpo -c -o gnunet_fs-directory.o `test -f
>> 'directory.c' || echo './'`directory.c
>> directory.c: In function 'directory_cache_locked':
>> directory.c:139: warning: passing argument 4 of
>> 'GNUNET_ECRS_directory_list_contents' from incompatible pointer type
>> directory.c:139: warning: passing argument 5 of
>> 'GNUNET_ECRS_directory_list_contents' from incompatible pointer type
>> directory.c:139: warning: passing argument 6 of
>> 'GNUNET_ECRS_directory_list_contents' from incompatible pointer type
>> directory.c:139: error: too few arguments to function
>> 'GNUNET_ECRS_directory_list_contents'
>> directory.c: In function 'gn_directory_upload_locked':
>> directory.c:382: warning: passing argument 3 of
>> 'GNUNET_ECRS_directory_create' from incompatible pointer type
>> directory.c:410: warning: passing argument 8 of 'GNUNET_ECRS_file_upload'
>> from incompatible pointer type
>> make[2]: *** [gnunet_fs-directory.o] Error 1
>
> The full build log is available from:
>
> http://people.debian.org/~lucas/logs/2009/07/13/gnunet-fuse_0.8.0-4_lsid64.buildlog
would be nice if you could have a look at it.
Regards,
Daniel
Modified: gnunet-fuse/configure.ac
===================================================================
--- gnunet-fuse/configure.ac 2009-07-16 20:03:48 UTC (rev 8709)
+++ gnunet-fuse/configure.ac 2009-07-16 20:16:46 UTC (rev 8710)
@@ -29,6 +29,7 @@
LDFLAGS="-L$with_gnunet/lib $LDFLAGS"
LIBPATH="$with_gnunet/lib $LIBPATH"
CPPFLAGS="-I$with_gnunet/include $CPPFLAGS"
+ CFLAGS="-I$with_gnunet/include $CFLAGS"
INCLUDEPATH="$with_gnunet/include $INCLUDEPATH"
AC_CHECK_HEADERS(GNUnet/gnunet_ecrs_lib.h,
AC_CHECK_LIB([gnunetecrs], [GNUNET_ECRS_file_download_partial],
Modified: gnunet-fuse/directory.c
===================================================================
--- gnunet-fuse/directory.c 2009-07-16 20:03:48 UTC (rev 8709)
+++ gnunet-fuse/directory.c 2009-07-16 20:16:46 UTC (rev 8710)
@@ -295,7 +295,8 @@
return -1;
}
-static void upcb(guint64 totalBytes, guint64 completedBytes, GNUNET_CronTime
eta,
+static void upcb(unsigned long long totalBytes,
+ unsigned long long completedBytes, GNUNET_CronTime eta,
void *closure)
{
(void)totalBytes;
@@ -357,7 +358,7 @@
{
int i, ret, fd;
char *buf, filename[] = GN_MKSTEMP_FILE;
- guint64 len;
+ unsigned long long len;
struct GNUNET_ECRS_URI *uri;
struct dir_upload_data d;
Modified: gnunet-fuse/file.c
===================================================================
--- gnunet-fuse/file.c 2009-07-16 20:03:48 UTC (rev 8709)
+++ gnunet-fuse/file.c 2009-07-16 20:16:46 UTC (rev 8710)
@@ -36,7 +36,8 @@
return GNUNET_OK;
}
-static void upcb(guint64 totalBytes, guint64 completedBytes, GNUNET_CronTime
eta,
+static void upcb(unsigned long long totalBytes,
+ unsigned long long completedBytes, GNUNET_CronTime eta,
void *closure)
{
(void)totalBytes;
Modified: gnunet-fuse/main.c
===================================================================
--- gnunet-fuse/main.c 2009-07-16 20:03:48 UTC (rev 8709)
+++ gnunet-fuse/main.c 2009-07-16 20:16:46 UTC (rev 8710)
@@ -144,7 +144,7 @@
gn_dirent_cache_init();
if(GNUNET_disk_file_test(ectx, argv[i]) == GNUNET_YES)
{
- guint64 len;
+ unsigned long long len;
char *uribuf;
root_fd = GNUNET_disk_file_open(ectx, argv[i], O_RDWR | O_SYNC);
Modified: gnunet-fuse/read.c
===================================================================
--- gnunet-fuse/read.c 2009-07-16 20:03:48 UTC (rev 8709)
+++ gnunet-fuse/read.c 2009-07-16 20:16:46 UTC (rev 8710)
@@ -101,7 +101,7 @@
GNUNET_free(special);
return 0;
}
- if(offset + size > slen)
+ if( ((ssize_t) (offset + size)) > slen)
{
size = slen - offset;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r8710 - gnunet-fuse,
gnunet <=