From 87c0e8fba2d0be4496ec4085136fca459f62c00c Mon Sep 17 00:00:00 2001
From: shishir gowda <shishirng@gluster.com>
Date: Wed, 27 Oct 2010 23:57:55 +0000
Subject: Solaris build fixes: Patch for 64bit build

This will fix build failures when -m64 option is used to build
gluster

Signed-off-by: Super-User <root@Solaris-10.(none)>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 1990 (Gluster mainline build on solaris fails with errors)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1990
---
 libglusterfs/src/compat.h   | 16 ++++++++++++++++
 rpc/xdr/src/cli1-xdr.c      |  2 +-
 rpc/xdr/src/glusterd1-xdr.c |  1 +
 rpc/xdr/src/portmap-xdr.c   |  1 +
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/libglusterfs/src/compat.h b/libglusterfs/src/compat.h
index 2f83054fa..690b4f9e6 100644
--- a/libglusterfs/src/compat.h
+++ b/libglusterfs/src/compat.h
@@ -351,4 +351,20 @@ dirent_size (struct dirent *entry)
 #define ST_CTIM_NSEC_SET(stbuf, val) do { } while (0);
 #endif
 
+#ifndef IXDR_GET_LONG
+#define IXDR_GET_LONG(buf) ((long)IXDR_GET_U_INT32(buf))
+#endif
+
+#ifndef IXDR_PUT_LONG
+#define IXDR_PUT_LONG(buf, v) ((long)IXDR_PUT_INT32(buf, (long)(v)))
+#endif
+
+#ifndef IXDR_GET_U_LONG
+#define IXDR_GET_U_LONG(buf)          ((u_long)IXDR_GET_LONG(buf))
+#endif
+
+#ifndef IXDR_PUT_U_LONG
+#define IXDR_PUT_U_LONG(buf, v)       IXDR_PUT_LONG(buf, (long)(v))
+#endif
+
 #endif /* __COMPAT_H__ */
diff --git a/rpc/xdr/src/cli1-xdr.c b/rpc/xdr/src/cli1-xdr.c
index 48ade6a07..713648ffa 100644
--- a/rpc/xdr/src/cli1-xdr.c
+++ b/rpc/xdr/src/cli1-xdr.c
@@ -24,7 +24,7 @@
  */
 
 #include "cli1.h"
-
+#include "compat.h"
 bool_t
 xdr_gf1_cluster_type (XDR *xdrs, gf1_cluster_type *objp)
 {
diff --git a/rpc/xdr/src/glusterd1-xdr.c b/rpc/xdr/src/glusterd1-xdr.c
index 189c1a56e..9f7cd222a 100644
--- a/rpc/xdr/src/glusterd1-xdr.c
+++ b/rpc/xdr/src/glusterd1-xdr.c
@@ -23,6 +23,7 @@
  */
 
 #include "glusterd1.h"
+#include "compat.h"
 
 bool_t
 xdr_glusterd_volume_status (XDR *xdrs, glusterd_volume_status *objp)
diff --git a/rpc/xdr/src/portmap-xdr.c b/rpc/xdr/src/portmap-xdr.c
index ddf6c47d7..45803dcc1 100644
--- a/rpc/xdr/src/portmap-xdr.c
+++ b/rpc/xdr/src/portmap-xdr.c
@@ -24,6 +24,7 @@
  */
 
 #include "portmap-xdr.h"
+#include "compat.h"
 
 bool_t
 xdr_pmap_port_by_brick_req (XDR *xdrs, pmap_port_by_brick_req *objp)
-- 
cgit