Browse Source

prevent gcc's whining

Cédric Augonnet 16 years ago
parent
commit
4c35a3d990
2 changed files with 4 additions and 4 deletions
  1. 3 3
      src/core/jobs.c
  2. 1 1
      src/core/jobs.h

+ 3 - 3
src/core/jobs.c

@@ -52,7 +52,7 @@ job_t __attribute__((malloc)) job_create(struct starpu_task *task)
 
 
 	if (task->synchronous)
 	if (task->synchronous)
 	{
 	{
-#ifdef __APPLE__ && __MACH__
+#if defined(__APPLE__) && defined(__MACH__)
 		pthread_mutex_init(&job->sync_mutex, NULL);
 		pthread_mutex_init(&job->sync_mutex, NULL);
 		pthread_cond_init(&job->sync_cond, NULL);
 		pthread_cond_init(&job->sync_cond, NULL);
 #else
 #else
@@ -102,7 +102,7 @@ void handle_job_termination(job_t j)
 
 
 	if (task->synchronous)
 	if (task->synchronous)
 	{
 	{
-#ifdef __APPLE__ && __MACH__
+#if defined(__APPLE__) && defined(__MACH__)
 		pthread_mutex_lock(&j->sync_mutex);
 		pthread_mutex_lock(&j->sync_mutex);
 		pthread_cond_signal(&j->sync_cond);
 		pthread_cond_signal(&j->sync_cond);
 		pthread_mutex_unlock(&j->sync_mutex);
 		pthread_mutex_unlock(&j->sync_mutex);
@@ -125,7 +125,7 @@ void handle_job_termination(job_t j)
 static void block_sync_task(job_t j)
 static void block_sync_task(job_t j)
 {
 {
 	{
 	{
-#ifdef __APPLE__ && __MACH__
+#if defined(__APPLE__) && defined(__MACH__)
 		pthread_mutex_lock(&j->sync_mutex);
 		pthread_mutex_lock(&j->sync_mutex);
 		pthread_cond_wait(&j->sync_cond, &j->sync_mutex);
 		pthread_cond_wait(&j->sync_cond, &j->sync_mutex);
 		pthread_mutex_unlock(&j->sync_mutex);
 		pthread_mutex_unlock(&j->sync_mutex);

+ 1 - 1
src/core/jobs.h

@@ -57,7 +57,7 @@ LIST_TYPE(job,
 
 
 /* Mac OS X does not provide anonymous semaphores,
 /* Mac OS X does not provide anonymous semaphores,
    so we use condition variable instead */
    so we use condition variable instead */
-#ifdef __APPLE__ && __MACH__
+#if defined(__APPLE__) && defined(__MACH__)
 	pthread_mutex_t sync_mutex;
 	pthread_mutex_t sync_mutex;
 	pthread_cond_t sync_cond;
 	pthread_cond_t sync_cond;
 #else
 #else