[aseprite] 24/196: Undefine ERROR macro in base/log.h if it's defined

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit a14a81a2c030c6b9a8052f2c1c32408edb369ade
Author: David Capello <davidcapello at gmail.com>
Date:   Thu Mar 3 19:27:09 2016 -0300

    Undefine ERROR macro in base/log.h if it's defined
---
 src/base/log.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/base/log.h b/src/base/log.h
index ba9039a..104098a 100644
--- a/src/base/log.h
+++ b/src/base/log.h
@@ -8,6 +8,10 @@
 #define BASE_LOG_H_INCLUDED
 #pragma once
 
+#ifdef ERROR
+#undef ERROR
+#endif
+
 enum LogLevel {
   NONE    = 0, // Default log level: do not log
   FATAL   = 1, // Something failed and we CANNOT continue the execution

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git