Merge remote-tracking branch 'origin/master'

5 files changed, 17 insertions, 17 deletions

diff --git a/include/cuse_lowlevel.h b/include/cuse_lowlevel.h
index e147fa2..80476c2 100644
--- a/include/cuse_lowlevel.h
+++ b/include/cuse_lowlevel.h
@@ -9,8 +9,8 @@
   Read example/cusexmp.c for usages.
 */
 
-#ifndef _CUSE_LOWLEVEL_H_
-#define _CUSE_LOWLEVEL_H_
+#ifndef CUSE_LOWLEVEL_H_
+#define CUSE_LOWLEVEL_H_
 
 #ifndef FUSE_USE_VERSION
 #define FUSE_USE_VERSION 29
@@ -84,4 +84,4 @@ int cuse_lowlevel_main(int argc, char *argv[], const struct cuse_info *ci,
 }
 #endif
 
-#endif /* _CUSE_LOWLEVEL_H_ */
+#endif /* CUSE_LOWLEVEL_H_ */
diff --git a/include/fuse.h b/include/fuse.h
index e16104c..7f5daa8 100644
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -6,8 +6,8 @@
   See the file COPYING.LIB.
 */
 
-#ifndef _FUSE_H_
-#define _FUSE_H_
+#ifndef FUSE_H_
+#define FUSE_H_
 
 /** @file
  *
@@ -222,7 +222,7 @@ struct fuse_operations {
 
 	/** Get file system statistics
 	 *
-	 * The 'f_frsize', 'f_favail', 'f_fsid' and 'f_flag' fields are ignored
+	 * The 'f_favail', 'f_fsid' and 'f_flag' fields are ignored
 	 *
 	 * Replaced 'struct statfs' parameter with 'struct statvfs' in
 	 * version 2.5
@@ -705,7 +705,7 @@ void fuse_exit(struct fuse *f);
  * If you are using multiple threads, you can enjoy all the parallel execution
  * and interactive response benefits of threads, and you get to enjoy all the
  * benefits of race conditions and locking bugs, too. Ensure that any code used
- * in the callback funtion of fuse_operations is also thread-safe.
+ * in the callback function of fuse_operations is also thread-safe.
  *
  * @param f the FUSE handle
  * @return 0 if no error occurred, -1 otherwise
@@ -936,4 +936,4 @@ struct fuse_session *fuse_get_session(struct fuse *f);
 }
 #endif
 
-#endif /* _FUSE_H_ */
+#endif /* FUSE_H_ */
diff --git a/include/fuse_common.h b/include/fuse_common.h
index 1730513..75e55e9 100644
--- a/include/fuse_common.h
+++ b/include/fuse_common.h
@@ -11,8 +11,8 @@
 #error "Never include <fuse_common.h> directly; use <fuse.h> or <fuse_lowlevel.h> instead."
 #endif
 
-#ifndef _FUSE_COMMON_H_
-#define _FUSE_COMMON_H_
+#ifndef FUSE_COMMON_H_
+#define FUSE_COMMON_H_
 
 #include "fuse_opt.h"
 #include <stdint.h>
@@ -523,4 +523,4 @@ struct _fuse_off_t_must_be_64bit_dummy_struct \
 	{ unsigned _fuse_off_t_must_be_64bit:((sizeof(off_t) == 8) ? 1 : -1); };
 #endif
 
-#endif /* _FUSE_COMMON_H_ */
+#endif /* FUSE_COMMON_H_ */
diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h
index 2ce3aa7..a01dbf6 100644
--- a/include/fuse_lowlevel.h
+++ b/include/fuse_lowlevel.h
@@ -6,8 +6,8 @@
   See the file COPYING.LIB.
 */
 
-#ifndef _FUSE_LOWLEVEL_H_
-#define _FUSE_LOWLEVEL_H_
+#ifndef FUSE_LOWLEVEL_H_
+#define FUSE_LOWLEVEL_H_
 
 /** @file
  *
@@ -1720,4 +1720,4 @@ void fuse_chan_put(struct fuse_chan *ch);
 }
 #endif
 
-#endif /* _FUSE_LOWLEVEL_H_ */
+#endif /* FUSE_LOWLEVEL_H_ */
diff --git a/include/fuse_opt.h b/include/fuse_opt.h
index 20653b1..d8573e7 100644
--- a/include/fuse_opt.h
+++ b/include/fuse_opt.h
@@ -6,8 +6,8 @@
   See the file COPYING.LIB.
 */
 
-#ifndef _FUSE_OPT_H_
-#define _FUSE_OPT_H_
+#ifndef FUSE_OPT_H_
+#define FUSE_OPT_H_
 
 /** @file
  *
@@ -268,4 +268,4 @@ int fuse_opt_match(const struct fuse_opt opts[], const char *opt);
 }
 #endif
 
-#endif /* _FUSE_OPT_H_ */
+#endif /* FUSE_OPT_H_ */