diff options
Diffstat (limited to 'libglusterfs/src/logging.h')
| -rw-r--r-- | libglusterfs/src/logging.h | 42 |
1 files changed, 5 insertions, 37 deletions
diff --git a/libglusterfs/src/logging.h b/libglusterfs/src/logging.h index 44f73c906..1f0c4ac7d 100644 --- a/libglusterfs/src/logging.h +++ b/libglusterfs/src/logging.h @@ -27,46 +27,14 @@ #endif #include <stdint.h> -#include <stdio.h> +#include <stdio.h> #include <stdarg.h> #define GF_PRI_FSBLK PRId64 -#define GF_PRI_BLKSIZE "ld" -#if GF_LINUX_HOST_OS - -# if __WORDSIZE == 64 -# define GF_PRI_SIZET "lu" -# define GF_PRI_NLINK "lu" -# else -# define GF_PRI_SIZET "u" -# define GF_PRI_NLINK "u" -# endif /* __WORDSIZE */ - -#elif GF_DARWIN_HOST_OS - -/* Noticed that size_t and ino_t are different on OSX, need to fix the warnings */ -# define GF_PRI_SIZET "lu" -# define GF_PRI_NLINK "u" - -# undef GF_PRI_FSBLK -# define GF_PRI_FSBLK "u" - -# undef GF_PRI_BLKSIZE -# define GF_PRI_BLKSIZE "u" - -# if __DARWIN_64_BIT_INO_T == 0 -# error '64 bit ino_t is must for GlusterFS to work, Compile with "CFLAGS=-D__DARWIN_64_BIT_INO_T"' -# endif /* __DARWIN_64_BIT_INO_T */ - -#else /* !LINUX && !DARWIN */ - -/* BSD and Solaris : Change as per testing there.. */ -# define GF_PRI_SIZET "lu" -# define GF_PRI_NLINK "u" - -#endif /* LINUX_OS */ - -#define GF_PRI_DEV GF_PRI_FSBLK +#define GF_PRI_BLKSIZE PRId32 +#define GF_PRI_SIZET PRId64 +#define GF_PRI_NLINK PRId32 +#define GF_PRI_DEV PRId64 typedef enum { GF_LOG_NONE, |