summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar nandika2011-01-15 01:56:17 +0000
committerGravatar nandika2011-01-15 01:56:17 +0000
commit9b2260ab4dbb671c2656383266d6f9fa7b863a69 (patch)
tree91104de81fc932691a60b6d38f4423bffa1719e9
parent1c5bff52616d792ab987de701be239bfabf7282e (diff)
downloadaxis2c-9b2260ab4dbb671c2656383266d6f9fa7b863a69.tar.gz
axis2c-9b2260ab4dbb671c2656383266d6f9fa7b863a69.tar.bz2
applied patch with jira issue 1510. Added !defined __APPLE__ to avoid build error on macos when checking for unistd.h
git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@1059222 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--util/include/platforms/unix/axutil_unix.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/util/include/platforms/unix/axutil_unix.h b/util/include/platforms/unix/axutil_unix.h
index 7a5c084..1829e06 100644
--- a/util/include/platforms/unix/axutil_unix.h
+++ b/util/include/platforms/unix/axutil_unix.h
@@ -104,7 +104,6 @@ extern "C"
#include <sys/time.h>
#include <sys/timeb.h>
- /*#include <unistd.h> */
#include <errno.h>
#include <sys/param.h>
#include <stdio.h>
@@ -122,9 +121,9 @@ extern "C"
#include "axutil_date_time_util_unix.h"
/* for file access handling */
-#ifdef HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H && !defined __APPLE__
#include <unistd.h>
-#endif /*HAVE_UNISTD_H */
+#endif /*HAVE_UNISTD_H && !defined __APPLE__*/
/* network handling */
#include <sys/socket.h>