Merging + fixing memory bugs

[satune.git] / src / common.h

diff --git a/src/common.h b/src/common.h
index 3a0eeaa01c4dd3a0ad0c8e9f7416968ef323f968..401a5e8af7cece371f3bd29cfce27ec0f211a0c9 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -18,6 +18,7 @@
 #include "config.h"
 #include "time.h"
 
+#define NANOSEC 1000000000.0
 
 #if 0
 extern int model_out;
@@ -55,9 +56,9 @@ void assert_hook(void);
                if (!(expr)) { \
                        fprintf(stderr, "Error: assertion failed in %s at line %d\n", __FILE__, __LINE__); \
                        /* print_trace(); // Trace printing may cause dynamic memory allocation */ \
-                       assert_hook();                                                                                                   \
-                       exit(EXIT_FAILURE);     \
-               }       \
+                       assert_hook();                           \
+                       exit(EXIT_FAILURE); \
+               } \
        } while (0)
 #else
 #define ASSERT(expr) \