From: Brian Aker <brian@tangent.org>
Date: Mon, 11 Feb 2013 12:22:44 +0000 (-0800)
Subject: Fix APPLE identifier.
X-Git-Tag: 1.0.17~6^2~9
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=a782b52ac1e87fa8e3757c6a5263bf7d01a1160c;p=m6w6%2Flibmemcached

Fix APPLE identifier.
---

diff --git a/libmemcached/do.cc b/libmemcached/do.cc
index c9d8e7e5..73ef06d3 100644
--- a/libmemcached/do.cc
+++ b/libmemcached/do.cc
@@ -30,7 +30,7 @@ static memcached_return_t _vdo_udp(org::libmemcached::Instance* instance,
   vector[0].length= UDP_DATAGRAM_HEADER_LENGTH;
 
   msg.msg_iov= (struct iovec*)vector;
-#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
+#ifdef __APPLE__
   msg.msg_iovlen= int(count);
 #else
   msg.msg_iovlen= count;
diff --git a/libtest/alarm.cc b/libtest/alarm.cc
index a8bf17e8..6193fbb3 100644
--- a/libtest/alarm.cc
+++ b/libtest/alarm.cc
@@ -76,7 +76,7 @@ void set_alarm(long tv_sec, long tv_usec)
     }
   }
 
-#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
+#ifdef __APPLE__
   struct timeval it_value= { time_t(tv_sec), suseconds_t(tv_usec) };
 #else
   struct timeval it_value= { tv_sec, tv_usec };
diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4
index 56472c72..01ff25d9 100644
--- a/m4/ax_platform.m4
+++ b/m4/ax_platform.m4
@@ -49,8 +49,7 @@
         AC_DEFINE([__APPLE_CC__],[1],[Workaround for bug in FreeBSD headers])],
         [*solaris*],[AC_DEFINE([TARGET_OS_SOLARIS],[1],[Whether we are building for Solaris])],
         [*darwin*],
-        [TARGET_OSX="true"
-        AC_DEFINE([TARGET_OS_OSX],[1],[Whether we build for OSX])],
+        [TARGET_OSX="true"],
         [*linux*],
         [TARGET_LINUX="true"
         AC_DEFINE([TARGET_OS_LINUX],[1],[Whether we build for Linux])])