|
From: <sv...@va...> - 2008-05-03 09:15:20
|
Author: bart
Date: 2008-05-03 10:15:25 +0100 (Sat, 03 May 2008)
New Revision: 7999
Log:
Changed #if defined(platform) tests into #if defined(HAVE_...) tests.
Modified:
trunk/exp-drd/drd_pthread_intercepts.c
trunk/exp-drd/tests/recursive_mutex.c
Modified: trunk/exp-drd/drd_pthread_intercepts.c
===================================================================
--- trunk/exp-drd/drd_pthread_intercepts.c 2008-05-03 09:12:15 UTC (rev 7998)
+++ trunk/exp-drd/drd_pthread_intercepts.c 2008-05-03 09:15:25 UTC (rev 7999)
@@ -118,9 +118,9 @@
/* PTHREAD_MUTEX_TIMED_NP */
/* PTHREAD_MUTEX_NORMAL */
case PTHREAD_MUTEX_DEFAULT:
-# if !defined(VGP_ppc32_aix5) && !defined(VGP_ppc64_aix5)
+#if defined(HAVE_PTHREAD_MUTEX_ADAPTIVE_NP)
case PTHREAD_MUTEX_ADAPTIVE_NP:
-# endif
+#endif
return mutex_type_default_mutex;
}
return mutex_type_invalid_mutex;
Modified: trunk/exp-drd/tests/recursive_mutex.c
===================================================================
--- trunk/exp-drd/tests/recursive_mutex.c 2008-05-03 09:12:15 UTC (rev 7998)
+++ trunk/exp-drd/tests/recursive_mutex.c 2008-05-03 09:15:25 UTC (rev 7999)
@@ -7,6 +7,7 @@
#include <stdio.h>
#include <unistd.h>
#include <pthread.h>
+#include "../../config.h"
static void lock_twice(pthread_mutex_t* const p)
@@ -21,14 +22,17 @@
{
/* Let the program abort after 3 seconds instead of leaving it deadlocked. */
alarm(3);
-#if !defined(_AIX)
+
+#if defined(HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
{
pthread_mutex_t m = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
printf("Recursive mutex (statically initialized).\n");
lock_twice(&m);
pthread_mutex_destroy(&m);
- }
+ }
+#endif
+#if defined(HAVE_PTHREAD_MUTEX_RECURSIVE_NP)
{
pthread_mutex_t m;
pthread_mutexattr_t attr;
@@ -40,7 +44,9 @@
pthread_mutexattr_destroy(&attr);
lock_twice(&m);
pthread_mutex_destroy(&m);
- }
+ }
+#endif
+#if defined(HAVE_PTHREAD_MUTEX_ERRORCHECK_NP)
{
pthread_mutex_t m;
pthread_mutexattr_t attr;
@@ -51,15 +57,16 @@
pthread_mutex_init(&m, &attr);
pthread_mutexattr_destroy(&attr);
lock_twice(&m);
- pthread_mutex_destroy(&m); }
-#endif /* !defined(_AIX) */
+ pthread_mutex_destroy(&m);
+ }
+#endif
{
pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER;
printf("Non-recursive mutex.\n");
fflush(stdout);
lock_twice(&m);
- }
+ }
printf("Done.\n");
return 0;
}
|