conditionally define U32_MAX

[~andy/linux] / include / linux / ceph / decode.h

diff --git a/include/linux/ceph/decode.h b/include/linux/ceph/decode.h
index 0442c3d800f0f9c8a9268a93715cfe2bc18c639b..27fe66a279b1e5aadb8b84e52973882df5cb25e3 100644 (file)
--- a/include/linux/ceph/decode.h
+++ b/include/linux/ceph/decode.h
@@ -10,6 +10,7 @@
 
 /* This seemed to be the easiest place to define these */
 
+#ifndef U32_MAX
 #define        U8_MAX  ((u8)(~0U))
 #define        U16_MAX ((u16)(~0U))
 #define        U32_MAX ((u32)(~0U))
@@ -24,6 +25,7 @@
 #define        S16_MIN ((s16)(-S16_MAX - 1))
 #define        S32_MIN ((s32)(-S32_MAX - 1))
 #define        S64_MIN ((s64)(-S64_MAX - 1LL))
+#endif /* !U32_MAX */
 
 /*
  * in all cases,