From: Charles Manning <cdhmanning@gmail.com>
Date: Thu, 14 Jun 2012 03:01:36 +0000 (+1200)
Subject: yaffs direct cleanups: C++ header wrapping and u32 type change
X-Git-Tag: pre-driver-refactoring~5
X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=8c97c553cb1f3adbb0b7d5393b32885fae2eb90d

yaffs direct cleanups: C++ header wrapping and u32 type change

Some of the clean-ups proposed by Stéphane Lesage.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>
---

diff --git a/direct/yaffsfs.h b/direct/yaffsfs.h
index 3196f0c..ba3f87f 100644
--- a/direct/yaffsfs.h
+++ b/direct/yaffsfs.h
@@ -34,6 +34,12 @@
 	( (sizeof(Y_LOFF_T) < 8) ? YAFFS_MAX_FILE_SIZE_32 : (0x800000000LL - 1) )
 
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+
 struct yaffs_dirent {
 	long d_ino;			/* inode number */
 	off_t d_off;			/* offset to this dirent */
@@ -207,4 +213,11 @@ int yaffs_set_error(int error);
 /* Trace control functions */
 unsigned  yaffs_set_trace(unsigned tm);
 unsigned  yaffs_get_trace(void);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif
diff --git a/direct/yportenv.h b/direct/yportenv.h
index b47a4d6..abc761b 100644
--- a/direct/yportenv.h
+++ b/direct/yportenv.h
@@ -22,7 +22,7 @@
 #ifdef CONFIG_YAFFS_DEFINES_TYPES
 typedef unsigned char u8;
 typedef unsigned short u16;
-typedef unsigned u32;
+typedef unsigned int u32;
 #endif