unified MX27, MX25, MX37 trees

[karo-tx-redboot.git] / packages / kernel / v2_0 / src / instrmnt / meminst.cxx

diff --git a/packages/kernel/v2_0/src/instrmnt/meminst.cxx b/packages/kernel/v2_0/src/instrmnt/meminst.cxx
index dd86748bd4ad0e2be7cd6ff31e15bc4e069cb4bd..68ac0af0a5fd7d53bf7a9b4b5efa9ea905b20174 100644 (file)
--- a/packages/kernel/v2_0/src/instrmnt/meminst.cxx
+++ b/packages/kernel/v2_0/src/instrmnt/meminst.cxx
@@ -226,7 +226,7 @@ externC cyg_bool cyg_instrument_state( cyg_uint32 cl, cyg_uint32 event)
 #ifdef CYGDBG_KERNEL_INSTRUMENT_MSGS
 #define CYGDBG_KERNEL_INSTRUMENT_MSGS_DEFINE_TABLE
 #include <cyg/kernel/instrument_desc.h>
-#define NELEM(x) (sizeof(x)/sizeof*(x))
+
 externC char * cyg_instrument_msg(CYG_WORD16 type) {
 
   struct instrument_desc_s *record;
@@ -234,7 +234,7 @@ externC char * cyg_instrument_msg(CYG_WORD16 type) {
   CYG_WORD cl, event;
 
   record = instrument_desc;
-  end_record = &instrument_desc[NELEM(instrument_desc)-1];
+  end_record = &instrument_desc[CYG_NELEM(instrument_desc)-1];
   cl = type & 0xff00;
   event = type & 0x00ff;