Merge branch 'master' of http://exfat.googlecode.com/svn/trunk/ into kitkat-x86

[android-x86/external-exfat.git] / fuse / main.c

diff --git a/fuse/main.c b/fuse/main.c
index 825fa19..ea2dee7 100644 (file)
--- a/fuse/main.c
+++ b/fuse/main.c
@@ -21,13 +21,13 @@
 */
 
 #define FUSE_USE_VERSION 26
+#include <exfat.h>
 #include <fuse.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <exfat.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <sys/types.h>
@@ -436,7 +436,7 @@ static char* add_fuse_options(char* options, const char* spec)
        return options;
 }
 
-int main(int argc, char* argv[])
+int mount_exfat_main(int argc, char* argv[])
 {
        struct fuse_args mount_args = FUSE_ARGS_INIT(0, NULL);
        struct fuse_args newfs_args = FUSE_ARGS_INIT(0, NULL);
@@ -567,7 +567,7 @@ int main(int argc, char* argv[])
        }
 
        /* go to background (unless "-d" option is passed) and run FUSE
-          main loop */
+               main loop */
        if (fuse_daemonize(debug) == 0)
        {
                if (fuse_loop(fh) != 0)