[prev in list] [next in list] [prev in thread] [next in thread] 

List:       klik-devel
Subject:    [klik-devel] [klikclient commit] r1605 - in
From:       codesite-noreply () google ! com
Date:       2008-06-20 14:57:38
Message-ID: 0016e644cf729ef70b04501a505d () google ! com
[Download RAW message or body]

Author: lionel.tricon
Date: Fri Jun 20 07:55:42 2008
New Revision: 1605

Modified:
   trunk/virtualization/unionfuse/trunk/fusioniso/configure
   trunk/virtualization/unionfuse/trunk/fusioniso/configure.in
   trunk/virtualization/unionfuse/trunk/fusioniso/src/fusemain.c

Log:
Use fuse version 26 instead of 25 (kernel api).
Minor change to support that.


Modified: trunk/virtualization/unionfuse/trunk/fusioniso/configure
==============================================================================
--- trunk/virtualization/unionfuse/trunk/fusioniso/configure	(original)
+++ trunk/virtualization/unionfuse/trunk/fusioniso/configure	Fri Jun 20 
07:55:42 2008
@@ -2256,7 +2256,7 @@

 # Define the identity of the package.
  PACKAGE=fusioniso
- VERSION=20080512
+ VERSION=20080620


 cat >>confdefs.h <<_ACEOF

Modified: trunk/virtualization/unionfuse/trunk/fusioniso/configure.in
==============================================================================
--- trunk/virtualization/unionfuse/trunk/fusioniso/configure.in	(original)
+++ trunk/virtualization/unionfuse/trunk/fusioniso/configure.in	Fri Jun 
20 07:55:42 2008
@@ -1,7 +1,7 @@
 AC_INIT(configure.in)

 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(fusioniso, 20080512)
+AM_INIT_AUTOMAKE(fusioniso, 20080620)

 AC_LANG_C
 AC_PROG_CC

Modified: trunk/virtualization/unionfuse/trunk/fusioniso/src/fusemain.c
==============================================================================
--- trunk/virtualization/unionfuse/trunk/fusioniso/src/fusemain.c	(original)
+++ trunk/virtualization/unionfuse/trunk/fusioniso/src/fusemain.c	Fri 
Jun 20 07:55:42 2008
@@ -52,7 +52,7 @@
 #include <sys/param.h>
 #include <pwd.h>

-#define FUSE_USE_VERSION 25
+#define FUSE_USE_VERSION 26
 #include <fuse.h>

 #include <zlib.h>
@@ -739,6 +739,6 @@
     }
     extern_base_root_length = strlen(extern_base_root);

-    if (extern_union_mounting) return fuse_main(nargc, nargv, &fs_oper_union);
-    return fuse_main(nargc, nargv, &fs_oper);
+    if (extern_union_mounting) return fuse_main(nargc, nargv, 
&fs_oper_union, NULL);
+    return fuse_main(nargc, nargv, &fs_oper, NULL);
 }
_______________________________________________
klik-devel mailing list
klik-devel@kde.org
https://mail.kde.org/mailman/listinfo/klik-devel
[prev in list] [next in list] [prev in thread] [next in thread]