From c4182651cfb31c5ca90a004a2aeec687def6dea7 Mon Sep 17 00:00:00 2001 From: John Coyle Date: Wed, 14 Oct 2015 10:54:17 -0400 Subject: [PATCH] os/filestore: The usage of __SWORD_TYPE hinders portability because it's not standardized. Removed __SWORD_TYPE dependency. Signed-off-by: John Coyle --- src/os/FileStore.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/os/FileStore.h b/src/os/FileStore.h index 2a04da2ac1aa..31c7da97a2fb 100644 --- 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 -- 2.47.3