summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2013-04-08 21:17:27 (GMT)
committerEvan Martin <martine@danga.com>2013-04-08 21:17:27 (GMT)
commit28411da9014bc780784e63ce2411fe9070c8caf1 (patch)
treed7be1bbd762b0f0e1951aa2742f2ddfa26ee9079 /src
parent1baebab74d036f40eddf47a361145305038fa78d (diff)
parentbb258a5b72a0237a0439d92ad360f5bfbcd8095e (diff)
downloadNinja-28411da9014bc780784e63ce2411fe9070c8caf1.zip
Ninja-28411da9014bc780784e63ce2411fe9070c8caf1.tar.gz
Ninja-28411da9014bc780784e63ce2411fe9070c8caf1.tar.bz2
Merge pull request #527 from wang-bin/compile_fix
fix compile error about noreturn on windows
Diffstat (limited to 'src')
-rw-r--r--src/util.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/util.h b/src/util.h
index 4c1c466..07381a1 100644
--- a/src/util.h
+++ b/src/util.h
@@ -28,11 +28,11 @@ using namespace std;
#ifdef _MSC_VER
#define NORETURN __declspec(noreturn)
#else
-#define NORETURN __attribute__((noreturn));
+#define NORETURN __attribute__((noreturn))
#endif
/// Log a fatal message and exit.
-void Fatal(const char* msg, ...) NORETURN;
+NORETURN void Fatal(const char* msg, ...);
/// Log a warning message.
void Warning(const char* msg, ...);
@@ -91,7 +91,7 @@ string ElideMiddle(const string& str, size_t width);
string GetLastErrorString();
/// Calls Fatal() with a function name and GetLastErrorString.
-void Win32Fatal(const char* function) NORETURN;
+NORETURN void Win32Fatal(const char* function);
#endif
#endif // NINJA_UTIL_H_