port to Ubuntu 8.10 x86-64 w/ gcc 4.3.2

[nbds] / include / lwt.h

diff --git a/include/lwt.h b/include/lwt.h
index dd98369a5d4570ef78d0b158b2a80ead0b95241b..5c0b6a4da92e6c7c4dec6e86b7739f8b7c5398e9 100644 (file)
--- a/include/lwt.h
+++ b/include/lwt.h
@@ -13,10 +13,10 @@
 #define TRACE(flag, format, v1, v2) lwt_trace(flag, format, (size_t)(v1), (size_t)(v2))
 #endif
 
-#ifdef NDEBUG
-#define ASSERT(x) 
+#ifndef NDEBUG
+#define ASSERT(x) do { if (!(x)) { lwt_halt(); assert(!#x); } } while (0)
 #else
-#define ASSERT(x) if (!(x)) { lwt_halt(); assert(!#x); }
+#define ASSERT(x) do { } while (0)
 #endif
 
 // Dump trace records to <file_name>. The file should be post-processed with "sort" before viewing.
@@ -37,9 +37,9 @@ static inline void lwt_trace (const char *flag, const char *format, size_t value
     extern char flag_state_[256];
     if (EXPECT_FALSE(flag_state_[(unsigned)flag[0]] >= flag[1])) {
         // embed <flags> in <format> so we don't have to make the lwt_record_t any bigger than it already is
-        format = (const char *)((size_t)format | ((uint64_t)flag[0] << 56) | ((uint64_t)flag[1] << 48));
-        extern void lwt_trace_i (const char *format, size_t value1, size_t value2);
-        lwt_trace_i(format, value1, value2);
+        uint64_t f = ((uint64_t)(size_t)format | ((uint64_t)flag[0] << 56) | ((uint64_t)flag[1] << 48));
+        extern void lwt_trace_i (uint64_t format, size_t value1, size_t value2);
+        lwt_trace_i(f, value1, value2);
     }
 }