From: Bart Van Assche <bvanassche@acm.org>
Date: Thu, 29 Apr 2010 06:28:43 +0000 (+0000)
Subject: Replaced most platform-test macros by HAVE_... macros.
X-Git-Tag: svn/VALGRIND_3_6_0~314
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31e293e6fd3e8873773febe54b1095b965365687;p=thirdparty%2Fvalgrind.git

Replaced most platform-test macros by HAVE_... macros.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11110
---

diff --git a/drd/tests/annotate_barrier.c b/drd/tests/annotate_barrier.c
index 914ca924a8..1cbaf237a1 100644
--- a/drd/tests/annotate_barrier.c
+++ b/drd/tests/annotate_barrier.c
@@ -12,6 +12,7 @@
 #include <stdlib.h>  /* atoi() */
 #include <string.h>  /* memset() */
 #include "../../drd/drd.h"
+#include "../../config.h"
 
 
 #define BARRIER_SERIAL_THREAD -1
@@ -83,7 +84,7 @@ static int barrier_wait(barrier_t* b)
   {
     while (b->barrier_count == barrier_count)
     {
-#ifdef __APPLE__
+#ifndef HAVE_PTHREAD_YIELD
       /* Darwin doesn't have an implementation of pthread_yield(). */
       usleep(100 * 1000);
 #else
diff --git a/drd/tests/annotate_rwlock.c b/drd/tests/annotate_rwlock.c
index bc290eeb5d..5ebb5fd24d 100644
--- a/drd/tests/annotate_rwlock.c
+++ b/drd/tests/annotate_rwlock.c
@@ -60,7 +60,7 @@ static void rwlock_rdlock(rwlock_t* p)
       ;
     if (p->writer_count == 0)
       break;
-#ifdef __APPLE__
+#ifndef HAVE_PTHREAD_YIELD
     /* Darwin doesn't have an implementation of pthread_yield(). */
     usleep(100 * 1000);
 #else
@@ -84,7 +84,7 @@ static void rwlock_wrlock(rwlock_t* p)
       ;
     if (p->reader_count == 0)
       break;
-#ifdef __APPLE__
+#ifndef HAVE_PTHREAD_YIELD
     /* Darwin doesn't have an implementation of pthread_yield(). */
     usleep(100 * 1000);
 #else
diff --git a/drd/tests/circular_buffer.c b/drd/tests/circular_buffer.c
index 9a7238cb43..720279422b 100644
--- a/drd/tests/circular_buffer.c
+++ b/drd/tests/circular_buffer.c
@@ -58,7 +58,7 @@ int fetch_and_add(int* p, int i)
 
 static sem_t* create_semaphore(const char* const name, const int value)
 {
-#ifdef __APPLE__
+#ifndef HAVE_SEM_INIT
   sem_t* p = sem_open(name, O_CREAT, 0600, value);
   return p;
 #else
@@ -71,7 +71,7 @@ static sem_t* create_semaphore(const char* const name, const int value)
 
 static void destroy_semaphore(const char* const name, sem_t* p)
 {
-#ifdef __APPLE__
+#ifndef HAVE_SEM_INIT
   sem_close(p);
   sem_unlink(name);
 #else
diff --git a/drd/tests/pth_inconsistent_cond_wait.c b/drd/tests/pth_inconsistent_cond_wait.c
index f7501cc25c..c5769097ec 100644
--- a/drd/tests/pth_inconsistent_cond_wait.c
+++ b/drd/tests/pth_inconsistent_cond_wait.c
@@ -14,6 +14,7 @@
 #include <sys/time.h>  // gettimeofday()
 #include <time.h>      // struct timespec
 #include <unistd.h>
+#include "../../config.h"
 
 
 #define PTH_CALL(expr)                                  \
@@ -42,7 +43,7 @@ static int             s_quiet;
 
 static sem_t* create_semaphore(const char* const name)
 {
-#ifdef __APPLE__
+#ifndef HAVE_SEM_INIT
   sem_t* p = sem_open(name, O_CREAT, 0600, 0);
   return p;
 #else
@@ -55,7 +56,7 @@ static sem_t* create_semaphore(const char* const name)
 
 static void destroy_semaphore(const char* const name, sem_t* p)
 {
-#ifdef __APPLE__
+#ifndef HAVE_SEM_INIT
   sem_close(p);
   sem_unlink(name);
 #else