[PATCH] udev_volume_id: fix endianess macros

diff --git a/extras/volume_id/volume_id/util.h b/extras/volume_id/volume_id/util.h
index 9cea8fc3a07c11d049fb69c9c74e029be1089563..e18efe2f213c563edaac0b0987c75d4e70608428 100644 (file)
--- a/extras/volume_id/volume_id/util.h
+++ b/extras/volume_id/volume_id/util.h
@@ -29,6 +29,8 @@
 #  include <config.h>
 #endif
 
+#include <endian.h>
+
 /* size of superblock buffer, reiserfs block is at 64k */
 #define SB_BUFFER_SIZE                         0x11000
 /* size of seek buffer, FAT cluster is 32k max */
@@ -52,6 +54,7 @@
                           (((__u64)(x) & 0x000000000000ff00ull) << 40) | \
                           (((__u64)(x) & 0x00000000000000ffull) << 56))
 
+#ifdef __BYTE_ORDER
 #if (__BYTE_ORDER == __LITTLE_ENDIAN)
 #define le16_to_cpu(x) (x)
 #define le32_to_cpu(x) (x)
@@ -69,6 +72,7 @@
 #define cpu_to_le32(x) bswap32(x)
 #define cpu_to_be32(x) (x)
 #endif
+#endif /* __BYTE_ORDER */
 
 enum uuid_format {
        UUID_DCE_STRING,

diff --git a/extras/volume_id/volume_id/volume_id.h b/extras/volume_id/volume_id/volume_id.h
index c7fa0d9bea25f76c13e5611b883742bbf64c8e0d..2266694f5e292833378f632dd07cea5b5f4aba84 100644 (file)
--- a/extras/volume_id/volume_id/volume_id.h
+++ b/extras/volume_id/volume_id/volume_id.h
@@ -21,7 +21,7 @@
 #ifndef _VOLUME_ID_H_
 #define _VOLUME_ID_H_
 
-#define VOLUME_ID_VERSION              43
+#define VOLUME_ID_VERSION              44
 
 #define VOLUME_ID_LABEL_SIZE           64
 #define VOLUME_ID_UUID_SIZE            36