os/filestore: The usage of __SWORD_TYPE hinders portability because it's not standard...

Signed-off-by: John Coyle <dx9err@gmail.com>

diff --git a/src/os/FileStore.h b/src/os/FileStore.h
index 2a04da2ac1aa2637c0fa563d518f06b67f343664..31c7da97a2fb74e55d44c14fc2349cb9c963ea70 100644 (file)
--- a/src/os/FileStore.h
+++ b/src/os/FileStore.h
@@ -52,14 +52,14 @@ using namespace std;
 
 #if defined(__linux__)
 # ifndef BTRFS_SUPER_MAGIC
-static const __SWORD_TYPE BTRFS_SUPER_MAGIC(0x9123683E);
+#define BTRFS_SUPER_MAGIC 0x9123683E
 # endif
 # ifndef XFS_SUPER_MAGIC
-static const __SWORD_TYPE XFS_SUPER_MAGIC(0x58465342);
+#define XFS_SUPER_MAGIC 0x58465342
+# endif
+# ifndef ZFS_SUPER_MAGIC
+#define ZFS_SUPER_MAGIC 0x2fc12fc1
 # endif
-#ifndef ZFS_SUPER_MAGIC
-static const __SWORD_TYPE ZFS_SUPER_MAGIC(0x2fc12fc1);
-#endif
 #endif