Skip to content

Commit

Permalink
Merge pull request #527 from wang-bin/compile_fix
Browse files Browse the repository at this point in the history
fix compile error about noreturn on windows
  • Loading branch information
evmar committed Apr 8, 2013
2 parents 1baebab + bb258a5 commit 28411da
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/util.h
Expand Up @@ -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, ...);
Expand Down Expand Up @@ -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_

0 comments on commit 28411da

Please sign in to comment.