iatt: changes across the codebase

- libglusterfs
  -- call-stub
  -- inode
  -- protocol
- libglusterfsclient
- cluster/replicate
- cluster/{dht,nufa,switch}
- cluster/unify
- cluster/HA
- cluster/map
- cluster/stripe
- debug/error-gen
- debug/trace
- debug/io-stats
- encryption/rot-13
- features/filter
- features/locks
- features/path-converter
- features/quota
- features/trash
- mount/fuse
- performance/io-threads
- performance/io-cache
- performance/quick-read
- performance/read-ahead
- performance/stat-prefetch
- performance/symlink-cache
- performance/write-behind
- protocol/client
- protocol/server
- storage-posix

Signed-off-by: Anand V. Avati <avati@blackhole.gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 361 (GlusterFS 3.0 should work on Mac OS/X)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=361

1 files changed, 5 insertions, 37 deletions

diff --git a/libglusterfs/src/logging.h b/libglusterfs/src/logging.h
index 44f73c9062f..1f0c4ac7dcd 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,