From 5c491aef41558df022032b543d826ef4e49493b5 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Wed, 20 Dec 1995 15:39:19 +0000
Subject: changes remerged after lost in disk crash -- recovered from snapshot,
 partially recovered working tree, etc

---
 cpukit/score/macros/rtems/score/watchdog.inl | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'cpukit/score/macros/rtems/score/watchdog.inl')

diff --git a/cpukit/score/macros/rtems/score/watchdog.inl b/cpukit/score/macros/rtems/score/watchdog.inl
index a8a061b144..d24224f93d 100644
--- a/cpukit/score/macros/rtems/score/watchdog.inl
+++ b/cpukit/score/macros/rtems/score/watchdog.inl
@@ -84,12 +84,11 @@
  *
  */
 
-#define _Watchdog_Insert_ticks( _the_watchdog, _units, _insert_mode ) \
-  { \
+#define _Watchdog_Insert_ticks( _the_watchdog, _units ) \
+  do { \
     (_the_watchdog)->initial = (_units); \
-    _Watchdog_Insert( &_Watchdog_Ticks_chain, \
-                        (_the_watchdog), (_insert_mode) ); \
-  }
+    _Watchdog_Insert( &_Watchdog_Ticks_chain, (_the_watchdog) ); \
+  } while ( 0 )
 
 /*PAGE
  *
@@ -97,12 +96,11 @@
  *
  */
 
-#define _Watchdog_Insert_seconds( _the_watchdog, _units, _insert_mode ) \
-  { \
+#define _Watchdog_Insert_seconds( _the_watchdog, _units ) \
+  do { \
     (_the_watchdog)->initial = (_units); \
-    _Watchdog_Insert( &_Watchdog_Seconds_chain, \
-                        (_the_watchdog), (_insert_mode) ); \
-  }
+    _Watchdog_Insert( &_Watchdog_Seconds_chain, (_the_watchdog) ); \
+  } while ( 0 )
 
 /*PAGE
  *
@@ -131,8 +129,7 @@
 #define _Watchdog_Reset( _the_watchdog ) \
    { \
      (void) _Watchdog_Remove( (_the_watchdog) ); \
-     _Watchdog_Insert( &_Watchdog_Ticks_chain, \
-                         (_the_watchdog), WATCHDOG_ACTIVATE_NOW ); \
+     _Watchdog_Insert( &_Watchdog_Ticks_chain, (_the_watchdog) ); \
    }
 
 /*PAGE
-- 
cgit v1.2.3