summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShehjar Tikoo <shehjart@gluster.com>2010-08-10 02:41:56 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-08-10 02:44:31 -0700
commit3b2de50546579b43ead84cff98f5c74e7bf7f840 (patch)
tree5d079cca1505e8b094f74731d50c7d9b928d3f88
parent5eb7cabfe7835604d132e4850ca6b656427df57f (diff)
nfs/rpc: 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
-rw-r--r--xlators/nfs/lib/src/rpcsvc.c5
-rw-r--r--xlators/nfs/lib/src/xdr-nfs3.c4
-rw-r--r--xlators/nfs/lib/src/xdr-nfs3.h5
3 files changed, 10 insertions, 4 deletions
diff --git a/xlators/nfs/lib/src/rpcsvc.c b/xlators/nfs/lib/src/rpcsvc.c
index 0a105ab0d..930634d65 100644
--- a/xlators/nfs/lib/src/rpcsvc.c
+++ b/xlators/nfs/lib/src/rpcsvc.c
@@ -219,7 +219,12 @@ nfs_rpcsvc_conn_peer_check_search (dict_t *options, char *pattern, char *clstr)
addrtok = strtok_r (addrstr, ",", &svptr);
while (addrtok) {
+ /* CASEFOLD not present on Solaris */
+#ifdef FNM_CASEFOLD
ret = fnmatch (addrtok, clstr, FNM_CASEFOLD);
+#else
+ ret = fnmatch (addrtok, clstr, 0);
+#endif
if (ret == 0)
goto err;
diff --git a/xlators/nfs/lib/src/xdr-nfs3.c b/xlators/nfs/lib/src/xdr-nfs3.c
index 036020396..0ea23dc1c 100644
--- a/xlators/nfs/lib/src/xdr-nfs3.c
+++ b/xlators/nfs/lib/src/xdr-nfs3.c
@@ -29,7 +29,7 @@
bool_t
xdr_uint64 (XDR *xdrs, uint64 *objp)
{
- if (!xdr_u_quad_t (xdrs, objp))
+ if (!xdr_uint64_t (xdrs, objp))
return FALSE;
return TRUE;
}
@@ -37,7 +37,7 @@ xdr_uint64 (XDR *xdrs, uint64 *objp)
bool_t
xdr_int64 (XDR *xdrs, int64 *objp)
{
- if (!xdr_quad_t (xdrs, objp))
+ if (!xdr_int64_t (xdrs, objp))
return FALSE;
return TRUE;
}
diff --git a/xlators/nfs/lib/src/xdr-nfs3.h b/xlators/nfs/lib/src/xdr-nfs3.h
index fe4046584..5af65e6b0 100644
--- a/xlators/nfs/lib/src/xdr-nfs3.h
+++ b/xlators/nfs/lib/src/xdr-nfs3.h
@@ -21,6 +21,7 @@
#define _XDR_NFS3_H
#include <rpc/rpc.h>
+#include <sys/types.h>
#define NFS3_FHSIZE 64
#define NFS3_COOKIEVERFSIZE 8
@@ -42,8 +43,8 @@
*/
#define NFS3_ENTRYP3_FIXED_SIZE (NFS3_ENTRY3_FIXED_SIZE + NFS3_POSTOPATTR_SIZE + NFS3_POSTOPFH3_FIXED_SIZE)
-typedef u_quad_t uint64;
-typedef quad_t int64;
+typedef uint64_t uint64;
+typedef int64_t int64;
typedef uint32_t uint32;
typedef int32_t int32;
typedef char *filename3;