From 8ea1a4844975940013d8704f87ee137dcb27bfb5 Mon Sep 17 00:00:00 2001
From: Harshavardhana <harsha@harshavardhana.net>
Date: Tue, 26 Aug 2014 14:40:01 -0700
Subject: porting: OSX build fixes

 - xml build
 - do not redefine AT_SYMLINK_FOLLOW

Change-Id: I516b3713904a6bad946a30f76fe4821f2ac61fd3
BUG: 1130307
Signed-off-by: Harshavardhana <harsha@harshavardhana.net>
Reviewed-on: http://review.gluster.org/8970
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
---
 cli/src/cli-rpc-ops.c     | 2 ++
 cli/src/cli.h             | 3 +++
 libglusterfs/src/compat.h | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c
index 268f5434a75..bb5e3b56378 100644
--- a/cli/src/cli-rpc-ops.c
+++ b/cli/src/cli-rpc-ops.c
@@ -8653,6 +8653,7 @@ cli_snapshot_status (dict_t *dict, gf_cli_rsp *rsp,
         }
 
         if (global_state->mode & GLUSTER_MODE_XML) {
+#if (HAVE_LIB_XML)
                 ret = cli_xml_snapshot_status_per_snap (local->writer,
                                                         local->doc,
                                                         dict, key);
@@ -8661,6 +8662,7 @@ cli_snapshot_status (dict_t *dict, gf_cli_rsp *rsp,
                                 "xml output for snapshot status");
                         goto out;
                 }
+#endif
         } else {
                 ret = cli_get_single_snap_status (dict, key);
                 if (ret) {
diff --git a/cli/src/cli.h b/cli/src/cli.h
index b48911648fa..e10dfafcbf3 100644
--- a/cli/src/cli.h
+++ b/cli/src/cli.h
@@ -395,9 +395,12 @@ cli_xml_output_snap_status_begin (cli_local_t *local, int op_ret, int op_errno,
                                   char *op_errstr);
 int
 cli_xml_output_snap_status_end (cli_local_t *local);
+
+#if (HAVE_LIB_XML)
 int
 cli_xml_snapshot_status_per_snap (xmlTextWriterPtr writer, xmlDocPtr doc,
                                   dict_t *dict, const char *keyprefix);
+#endif
 int
 cli_xml_output_snapshot (int cmd_type, dict_t *dict, int op_ret,
                          int op_errno, char *op_errstr);
diff --git a/libglusterfs/src/compat.h b/libglusterfs/src/compat.h
index 20d15c44e70..aae2bdb7e89 100644
--- a/libglusterfs/src/compat.h
+++ b/libglusterfs/src/compat.h
@@ -190,7 +190,9 @@ enum {
 #define le64toh(x) OSSwapLittleToHostInt64(x)
 
 #define UNIX_PATH_MAX 104
+#ifndef AT_SYMLINK_NOFOLLOW
 #define AT_SYMLINK_NOFOLLOW 0x100
+#endif
 #include <sys/types.h>
 
 #include <sys/un.h>
-- 
cgit