diff options
Diffstat (limited to 'ninja/src/util.h')
-rw-r--r-- | ninja/src/util.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/ninja/src/util.h b/ninja/src/util.h index 6a4a7a9f843..4ee41a500a8 100644 --- a/ninja/src/util.h +++ b/ninja/src/util.h @@ -34,20 +34,6 @@ using namespace std; /// Log a fatal message and exit. NORETURN void Fatal(const char* msg, ...); -// Have a generic fall-through for different versions of C/C++. -#if defined(__cplusplus) && __cplusplus >= 201703L -#define NINJA_FALLTHROUGH [[fallthrough]] -#elif defined(__cplusplus) && __cplusplus >= 201103L && defined(__clang__) -#define NINJA_FALLTHROUGH [[clang::fallthrough]] -#elif defined(__cplusplus) && __cplusplus >= 201103L && defined(__GNUC__) && \ - __GNUC__ >= 7 -#define NINJA_FALLTHROUGH [[gnu::fallthrough]] -#elif defined(__GNUC__) && __GNUC__ >= 7 // gcc 7 -#define NINJA_FALLTHROUGH __attribute__ ((fallthrough)) -#else // C++11 on gcc 6, and all other cases -#define NINJA_FALLTHROUGH -#endif - /// Log a warning message. void Warning(const char* msg, ...); @@ -119,7 +105,7 @@ bool Truncate(const string& path, size_t size, string* err); string GetLastErrorString(); /// Calls Fatal() with a function name and GetLastErrorString. -NORETURN void Win32Fatal(const char* function, const char* hint = NULL); +NORETURN void Win32Fatal(const char* function); #endif #endif // NINJA_UTIL_H_ |