#define CompareUInt64(a,b) (afs_uint64)(a) - (afs_uint64)(b)
#define NonZeroInt64(a) (a)
#define Int64ToInt32(a) (a) & MAX_AFS_UINT32
-#define FillInt64(t,h,l) (t) = (h); (t) <<= 32; (t) |= (l);
-#define SplitInt64(t,h,l) (h) = (t) >> 32; (l) = (t) & MAX_AFS_UINT32;
+#define FillInt64(t,h,l) (t) = ((afs_int64)(h) << 32) | (l);
+#define SplitInt64(t,h,l) (h) = ((afs_int64)t) >> 32; (l) = (t) & MAX_AFS_UINT32;
#define RoundInt64ToInt32(a) (a > MAX_AFS_UINT32) ? MAX_AFS_UINT32 : a;
#define RoundInt64ToInt31(a) (a > MAX_AFS_INT32) ? MAX_AFS_INT32 : a;
#else /* AFS_64BIT_ENV */
#define SIGN 0x80000000
#define hadd32(a,i) \
- (((((a).low ^ (int)(i)) & SIGN) \
+ ((void)((((a).low ^ (int)(i)) & SIGN) \
? (((((a).low + (int)(i)) & SIGN) == 0) && (a).high++) \
: (((a).low & (int)(i) & SIGN) && (a).high++)), \
(a).low += (int)(i))
#define AFS_DEMAND_ATTACH_FS 1
#endif
+#ifdef AFS_HPUX_ENV
+#define static_inline static __inline
+#define hdr_static_inline static __inline
+#elif defined(AFS_AIX_ENV) || defined(AFS_SGI_ENV)
+#define static_inline static
+#define hdr_static_inline
+#else
+#define static_inline static inline
+#define hdr_static_inline static inline
+#endif
+
+/* A macro that can be used when printf'ing 64 bit integers, as Unix and
+ * windows use a different format string
+ */
+#ifdef AFS_NT40_ENV
+#define AFS_INT64_FMT "l64d"
+#else
+#define AFS_INT64_FMT "lld"
+#endif
+
+/* Functions to safely cast afs_int32 and afs_uint32 so they can be used in
+ * printf statemements with %ld and %lu
+ */
+
+hdr_static_inline long int afs_cast_int32(afs_int32 d) { return (long int) d; }
+hdr_static_inline unsigned long int afs_cast_uint32(afs_uint32 d) { return (unsigned long int) d; }
+
#endif /* OPENAFS_CONFIG_AFS_STDS_H */