diff options
| author | Evan Martin <martine@danga.com> | 2014-11-18 16:04:23 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2014-11-18 17:05:58 (GMT) |
| commit | ba1ede49896316534b755f234a52fc182ed70347 (patch) | |
| tree | a894dfd1efea76d00cb848310e628f9c2ed740d6 | |
| parent | bca80b12ff2702d0403c31ce34fca90ec7df2d28 (diff) | |
| download | Ninja-ba1ede49896316534b755f234a52fc182ed70347.zip Ninja-ba1ede49896316534b755f234a52fc182ed70347.tar.gz Ninja-ba1ede49896316534b755f234a52fc182ed70347.tar.bz2 | |
drop NINJA_BOOTSTRAP define
| -rw-r--r-- | src/minidump-win32.cc | 5 | ||||
| -rw-r--r-- | src/ninja.cc | 2 |
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); |