summaryrefslogtreecommitdiffstats
path: root/rpc/xdr/src
diff options
context:
space:
mode:
authorShehjar Tikoo <shehjart@gluster.com>2010-08-10 02:41:57 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-08-10 02:44:35 -0700
commit6cf8c2114a691a9b3f0eb42164d51e7fa86d33ea (patch)
treec64a6d22930c0145a9a6699568ef3b72ba5fac2f /rpc/xdr/src
parent3b2de50546579b43ead84cff98f5c74e7bf7f840 (diff)
rpc-lib: Solaris build fixes
Signed-off-by: Shehjar Tikoo <shehjart@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 1178 (Gluster mainline build fails on Solaris) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1178
Diffstat (limited to 'rpc/xdr/src')
-rw-r--r--rpc/xdr/src/cli1-xdr.h3
-rw-r--r--rpc/xdr/src/glusterd1-xdr.h2
-rw-r--r--rpc/xdr/src/glusterfs3-xdr.h2
-rw-r--r--rpc/xdr/src/xdr-generic.h3
4 files changed, 6 insertions, 4 deletions
diff --git a/rpc/xdr/src/cli1-xdr.h b/rpc/xdr/src/cli1-xdr.h
index 2f71df4a891..3580ebb766d 100644
--- a/rpc/xdr/src/cli1-xdr.h
+++ b/rpc/xdr/src/cli1-xdr.h
@@ -6,7 +6,8 @@
#ifndef _CLI1_H_RPCGEN
#define _CLI1_H_RPCGEN
-#include <rpc/rpc.h>
+//#include <rpc/rpc.h>
+#include <rpc/xdr.h>
#ifdef __cplusplus
diff --git a/rpc/xdr/src/glusterd1-xdr.h b/rpc/xdr/src/glusterd1-xdr.h
index 85ca9b4ba1e..256e4d42a01 100644
--- a/rpc/xdr/src/glusterd1-xdr.h
+++ b/rpc/xdr/src/glusterd1-xdr.h
@@ -6,7 +6,7 @@
#ifndef _GLUSTERD1_H_RPCGEN
#define _GLUSTERD1_H_RPCGEN
-#include <rpc/rpc.h>
+//#include <rpc/rpc.h>
#ifdef __cplusplus
diff --git a/rpc/xdr/src/glusterfs3-xdr.h b/rpc/xdr/src/glusterfs3-xdr.h
index a3afe8861ac..71c0248e75f 100644
--- a/rpc/xdr/src/glusterfs3-xdr.h
+++ b/rpc/xdr/src/glusterfs3-xdr.h
@@ -6,7 +6,7 @@
#ifndef _GLUSTERFS3_H_RPCGEN
#define _GLUSTERFS3_H_RPCGEN
-#include <rpc/rpc.h>
+//#include <rpc/rpc.h>
#include "xdr-common.h"
#include "iatt.h"
diff --git a/rpc/xdr/src/xdr-generic.h b/rpc/xdr/src/xdr-generic.h
index 7ee52fe2625..182f7b42148 100644
--- a/rpc/xdr/src/xdr-generic.h
+++ b/rpc/xdr/src/xdr-generic.h
@@ -22,7 +22,8 @@
#define _XDR_GENERIC_H
#include <sys/uio.h>
-#include <rpc/rpc.h>
+//#include <rpc/rpc.h>
+#include <rpc/xdr.h>
#define xdr_decoded_remaining_addr(xdr) ((&xdr)->x_private)
#define xdr_decoded_remaining_len(xdr) ((&xdr)->x_handy)