From 99ed21358ab4490ada34a4bb26ab2604c89db4b9 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Mon, 17 Nov 2008 18:35:05 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@515
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 src/chevents.c       | 8 ++++----
 src/include/events.h | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/chevents.c b/src/chevents.c
index f67bea11a..bcf02504d 100644
--- a/src/chevents.c
+++ b/src/chevents.c
@@ -160,7 +160,7 @@ void chEvtDispatch(const evhandler_t handlers[], eventmask_t mask) {
   }
 }
 
-#if defined(CH_OPTIMIZE_SPEED) || !defined(CH_USE_EVENT_TIMEOUT)
+#if defined(CH_OPTIMIZE_SPEED) || !defined(CH_USE_EVENTS_TIMEOUT)
 /**
  * A pending event among those specified in \p ewmask is selected, cleared and
  * its mask returned.
@@ -276,9 +276,9 @@ eventid_t chEvtWait(eventmask_t ewmask,
 
   return i;
 }
-#endif /* defined(CH_OPTIMIZE_SPEED) || !defined(CH_USE_EVENT_TIMEOUT) */
+#endif /* defined(CH_OPTIMIZE_SPEED) || !defined(CH_USE_EVENTS_TIMEOUT) */
 
-#ifdef CH_USE_EVENT_TIMEOUT
+#ifdef CH_USE_EVENTS_TIMEOUT
 /**
  * Waits for a single event.
  * A pending event among those specified in \p ewmask is selected, cleared and
@@ -409,7 +409,7 @@ eventid_t chEvtWaitTimeout(eventmask_t ewmask,
 
   return i;
 }
-#endif /* CH_USE_EVENT_TIMEOUT */
+#endif /* CH_USE_EVENTS_TIMEOUT */
 
 #endif /* CH_USE_EVENTS */
 
diff --git a/src/include/events.h b/src/include/events.h
index 2f3eda366..c851a2c82 100644
--- a/src/include/events.h
+++ b/src/include/events.h
@@ -90,14 +90,14 @@ extern "C" {
   void chEvtBroadcast(EventSource *esp);
   void chEvtBroadcastI(EventSource *esp);
   void chEvtDispatch(const evhandler_t handlers[], eventmask_t mask);
-#if defined(CH_OPTIMIZE_SPEED) || !defined(CH_USE_EVENT_TIMEOUT)
+#if defined(CH_OPTIMIZE_SPEED) || !defined(CH_USE_EVENTS_TIMEOUT)
   eventmask_t chEvtWaitOne(eventmask_t ewmask);
   eventmask_t chEvtWaitAny(eventmask_t ewmask);
   eventmask_t chEvtWaitAll(eventmask_t ewmask);
   eventid_t chEvtWait(eventmask_t ewmask,
                       const evhandler_t handlers[]);
 #endif
-#ifdef CH_USE_EVENT_TIMEOUT
+#ifdef CH_USE_EVENTS_TIMEOUT
   eventmask_t chEvtWaitOneTimeout(eventmask_t ewmask, systime_t time);
   eventmask_t chEvtWaitAnyTimeout(eventmask_t ewmask, systime_t time);
   eventmask_t chEvtWaitAllTimeout(eventmask_t ewmask, systime_t time);
@@ -122,7 +122,7 @@ extern "C" {
  */
 #define chEvtRegister(esp, elp, eid) chEvtRegisterMask(esp, elp, EVENT_MASK(eid))
 
-#if !defined(CH_OPTIMIZE_SPEED) && defined(CH_USE_EVENT_TIMEOUT)
+#if !defined(CH_OPTIMIZE_SPEED) && defined(CH_USE_EVENTS_TIMEOUT)
 #define chEvtWaitOne(ewmask) chEvtWaitOneTimeout(ewmask, TIME_INFINITE)
 #define chEvtWaitAny(ewmask) chEvtWaitAnyTimeout(ewmask, TIME_INFINITE)
 #define chEvtWaitAll(ewmask) chEvtWaitAllTimeout(ewmask, TIME_INFINITE)
-- 
cgit v1.2.3