Merge branch 'master' of git://github.com/irungentoo/ProjectTox-Core into auto_tests

1 files changed, 2 insertions, 0 deletions

diff --git a/testing/misc_tools.h b/testing/misc_tools.h
index eb09693e..1abdb809 100644
--- a/testing/misc_tools.h
+++ b/testing/misc_tools.h
@@ -51,6 +51,7 @@ unsigned char * hex_string_to_bin(char hex_string[]);
         DEBUG_PRINT(__VA_ARGS__, ' '); \
     } while (0)
 
+        #undef ERROR
     #define ERROR(exit_status, ...) do { \
         fprintf(stderr, "error in "); \
         DEBUG_PRINT(__VA_ARGS__, ' '); \
@@ -58,6 +59,7 @@ unsigned char * hex_string_to_bin(char hex_string[]);
     } while (0)
 #else
     #define WARNING(...)
+    #undef ERROR
     #define ERROR(...)
 #endif // DEBUG