Fix APPLE identifier.

diff --git a/libmemcached/do.cc b/libmemcached/do.cc
index c9d8e7e54c2e1d2bdda77d984633e727f4ddadc9..73ef06d34f11063859e19c92e331a4f27288a47a 100644 (file)
--- 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 a8bf17e89d3b66bcc2163b1d25ae3a5953d8a26c..6193fbb3cd094065a089c9a21cc84a1c67ae0127 100644 (file)
--- 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 56472c72efdb6fd82c5e54273a7e4f7245e7416b..01ff25d90abd58f28cc055d3703fccae6af1dd3f 100644 (file)
--- 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])])