summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/minidump-win32.cc5
-rw-r--r--src/ninja.cc2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/minidump-win32.cc b/src/minidump-win32.cc
index c79ec0e..c611919 100644
--- a/src/minidump-win32.cc
+++ b/src/minidump-win32.cc
@@ -12,12 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef NINJA_BOOTSTRAP
+#ifdef _MSC_VER
#include <windows.h>
#include <DbgHelp.h>
-
#include "util.h"
typedef BOOL (WINAPI *MiniDumpWriteDumpFunc) (
@@ -85,4 +84,4 @@ void CreateWin32MiniDump(_EXCEPTION_POINTERS* pep) {
Warning("minidump created: %s", temp_file);
}
-#endif // NINJA_BOOTSTRAP
+#endif // _MSC_VER
diff --git a/src/ninja.cc b/src/ninja.cc
index 847000a..2c890c2 100644
--- a/src/ninja.cc
+++ b/src/ninja.cc
@@ -1111,7 +1111,7 @@ int real_main(int argc, char** argv) {
} // anonymous namespace
int main(int argc, char** argv) {
-#if !defined(NINJA_BOOTSTRAP) && defined(_MSC_VER)
+#if defined(_MSC_VER)
// Set a handler to catch crashes not caught by the __try..__except
// block (e.g. an exception in a stack-unwind-block).
set_terminate(TerminateHandler);