Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/kernel/current/ChangeLog,v
retrieving revision 1.144
diff -u -5 -p -r1.144 ChangeLog
--- ChangeLog 15 Sep 2007 14:42:39 -0000 1.144
+++ ChangeLog 14 Nov 2008 14:09:32 -0000
@@ -1,5 +1,10 @@
+2008-11-14 Jonathan Larmour <[EMAIL PROTECTED]>
+
+ * tests/tm_basic.cxx (max): Resolve issue 1000636 with extra
+ bracketing.
+
2007-08-23 Hans Rosenfeld <[EMAIL PROTECTED]>
* tests/intr0.cxx, tests/kintr0.c: As suggested by Bart Veer,
priorities of the interrupts created by intr0 and kintr0 can now
be overridden by the HAL through HAL_INTR_TEST_PRIO_x constants.
Index: tests/tm_basic.cxx
===================================================================
RCS file: /cvs/ecos/ecos/packages/kernel/current/tests/tm_basic.cxx,v
retrieving revision 1.23
diff -u -5 -p -r1.23 tm_basic.cxx
--- tests/tm_basic.cxx 8 Jan 2007 16:20:14 -0000 1.23
+++ tests/tm_basic.cxx 14 Nov 2008 14:09:33 -0000
@@ -208,11 +208,11 @@ void run_semaphore_circuit_test(void);
void run_counter_tests(void);
void run_flag_tests(void);
void run_alarm_tests(void);
#ifndef max
-#define max(n,m) (m > n ? n : m)
+#define max(n,m) ((m) > (n) ? (n) : (m))
#endif
// Wait until a clock tick [real time clock] has passed. This should keep it
// from happening again during a measurement, thus minimizing any fluctuations
void
