merge with harmony

2016-09-11 18:21:59 +02:00
parent e1d57b5312 4b0227998e
commit 51c20a59f7
77 changed files with 2816 additions and 8083 deletions
@@ -34,7 +34,7 @@
 #include <platform_types.h>
 #endif

-#if defined(ENB_MODE)
+#if defined(ENB_MODE2)
 # define display_backtrace()
 #else
 # include "backtrace.h"
@@ -59,7 +59,7 @@ do {                                                        \
                "In %s() %s:%d\n" fORMAT,                   \
                __FUNCTION__, __FILE__, __LINE__, ##aRGS);  \
        aCTION;                                             \
-    }                                                       \
+    }						\
 } while(0)

 #define AssertFatal(cOND, fORMAT, aRGS...)          _Assert_(cOND, _Assert_Exit_, fORMAT, ##aRGS)