From 330944e658f7a74a58d0d3157af3cafa1feaa3ea Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 7 Feb 2009 19:14:15 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@742
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 test/test.c      | 18 +++++++++---------
 test/testcond.c  |  2 +-
 test/testdyn.c   |  6 +++---
 test/testevt.c   |  2 +-
 test/testheap.c  |  2 +-
 test/testmtx.c   |  2 +-
 test/testpools.c |  2 +-
 test/testsem.c   |  2 +-
 8 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'test')

diff --git a/test/test.c b/test/test.c
index 83be7410a..5300bce88 100644
--- a/test/test.c
+++ b/test/test.c
@@ -37,35 +37,35 @@
 static const struct testcase *tests[] = {
   &testrdy1,
   &testrdy2,
-#ifdef CH_USE_SEMAPHORES
+#if CH_USE_SEMAPHORES
   &testsem1,
   &testsem2,
 #endif
-#ifdef CH_USE_MUTEXES
+#if CH_USE_MUTEXES
   &testmtx1,
   &testmtx2,
   &testmtx3,
-#ifdef CH_USE_CONDVARS
+#if CH_USE_CONDVARS
   &testcond1,
   &testcond2,
 #endif
 #endif
-#ifdef CH_USE_MESSAGES
+#if CH_USE_MESSAGES
   &testmsg1,
 #endif
-#ifdef CH_USE_EVENTS
+#if CH_USE_EVENTS
   &testevt1,
 #endif
-#ifdef CH_USE_HEAP
+#if CH_USE_HEAP
   &testheap1,
 #endif
-#ifdef CH_USE_MEMPOOLS
+#if CH_USE_MEMPOOLS
   &testpools1,
 #endif
-#if defined(CH_USE_DYNAMIC) && defined(CH_USE_HEAP)
+#if CH_USE_DYNAMIC && CH_USE_HEAP
   &testdyn1,
 #endif
-#if defined(CH_USE_DYNAMIC) && defined(CH_USE_MEMPOOLS)
+#if CH_USE_DYNAMIC && CH_USE_MEMPOOLS
   &testdyn2,
 #endif
   &testbmk1,
diff --git a/test/testcond.c b/test/testcond.c
index cbc304270..f6f390044 100644
--- a/test/testcond.c
+++ b/test/testcond.c
@@ -21,7 +21,7 @@
 
 #include "test.h"
 
-#if defined(CH_USE_CONDVARS) && defined(CH_USE_MUTEXES)
+#if CH_USE_CONDVARS && CH_USE_MUTEXES
 
 static Mutex m1;
 static CondVar c1;
diff --git a/test/testdyn.c b/test/testdyn.c
index 37b6b9bc4..f59cdaa14 100644
--- a/test/testdyn.c
+++ b/test/testdyn.c
@@ -21,7 +21,7 @@
 
 #include "test.h"
 
-#ifdef CH_USE_DYNAMIC
+#if CH_USE_DYNAMIC
 
 static msg_t thread(void *p) {
 
@@ -29,7 +29,7 @@ static msg_t thread(void *p) {
   return 0;
 }
 
-#ifdef CH_USE_HEAP
+#if CH_USE_HEAP
 static char *dyn1_gettest(void) {
 
   return "Dynamic APIs, threads creation from heap";
@@ -78,7 +78,7 @@ const struct testcase testdyn1 = {
 };
 #endif /* CH_USE_HEAP */
 
-#ifdef CH_USE_MEMPOOLS
+#if CH_USE_MEMPOOLS
 static MemoryPool mp1;
 
 static char *dyn2_gettest(void) {
diff --git a/test/testevt.c b/test/testevt.c
index 28e54cbf6..706953dd6 100644
--- a/test/testevt.c
+++ b/test/testevt.c
@@ -21,7 +21,7 @@
 
 #include "test.h"
 
-#ifdef CH_USE_EVENTS
+#if CH_USE_EVENTS
 
 #define ALLOWED_DELAY MS2ST(5)
 
diff --git a/test/testheap.c b/test/testheap.c
index b6468b6be..e9907baba 100644
--- a/test/testheap.c
+++ b/test/testheap.c
@@ -21,7 +21,7 @@
 
 #include "test.h"
 
-#ifdef CH_USE_HEAP
+#if CH_USE_HEAP
 
 #define SIZE 16
 
diff --git a/test/testmtx.c b/test/testmtx.c
index 52c756436..7675f3f7c 100644
--- a/test/testmtx.c
+++ b/test/testmtx.c
@@ -21,7 +21,7 @@
 
 #include "test.h"
 
-#ifdef CH_USE_MUTEXES
+#if CH_USE_MUTEXES
 
 #define ALLOWED_DELAY 5
 
diff --git a/test/testpools.c b/test/testpools.c
index d3f451c73..2165c39d1 100644
--- a/test/testpools.c
+++ b/test/testpools.c
@@ -21,7 +21,7 @@
 
 #include "test.h"
 
-#ifdef CH_USE_MEMPOOLS
+#if CH_USE_MEMPOOLS
 
 static MemoryPool mp1;
 
diff --git a/test/testsem.c b/test/testsem.c
index 1ec0a7a13..c16bb0e68 100644
--- a/test/testsem.c
+++ b/test/testsem.c
@@ -21,7 +21,7 @@
 
 #include "test.h"
 
-#ifdef CH_USE_SEMAPHORES
+#if CH_USE_SEMAPHORES
 
 #define ALLOWED_DELAY MS2ST(5)
 
-- 
cgit v1.2.3