Merge branch 'master' of github.com:martine/ninja

Conflicts:
	src/util.cc
	src/util.h

1 files changed, 3 insertions, 0 deletions

diff --git a/src/util.h b/src/util.h
index efbb88b..dc3e40f 100644
--- a/src/util.h
+++ b/src/util.h
@@ -21,6 +21,9 @@
 // Log a fatal message, dump a backtrace, and exit.
 void Fatal(const char* msg, ...);
 
+// Log an error message.
+void Error(const char* msg, ...);
+
 // Canonicalize a path like "foo/../bar.h" into just "bar.h".
 bool CanonicalizePath(std::string* path, std::string* err);