diff options
| -rw-r--r-- | base/bzip2_error_handler.cc | 1 | ||||
| -rw-r--r-- | third_party/bzip2/SConscript | 1 | ||||
| -rw-r--r-- | third_party/bzip2/bzip2.vcproj | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/base/bzip2_error_handler.cc b/base/bzip2_error_handler.cc index 2774627..7556cb9 100644 --- a/base/bzip2_error_handler.cc +++ b/base/bzip2_error_handler.cc @@ -31,6 +31,7 @@ // We define BZ_NO_STDIO in third_party/bzip2 to remove its internal STDERR // error reporting. This requires us to export our own error handler. +extern "C" void bz_internal_error(int errcode) { CHECK(false) << "bzip2 internal error: " << errcode; } diff --git a/third_party/bzip2/SConscript b/third_party/bzip2/SConscript index d0d814da..6f2157e 100644 --- a/third_party/bzip2/SConscript +++ b/third_party/bzip2/SConscript @@ -33,6 +33,7 @@ env = env.Clone() env.Append(
CCFLAGS = [
+ '/DBZ_NO_STDIO',
'/TC',
'/wd4996',
diff --git a/third_party/bzip2/bzip2.vcproj b/third_party/bzip2/bzip2.vcproj index c60c1c1..b33f293 100644 --- a/third_party/bzip2/bzip2.vcproj +++ b/third_party/bzip2/bzip2.vcproj @@ -18,6 +18,7 @@ > <Tool Name="VCCLCompilerTool" + PreprocessorDefinitions="BZ_NO_STDIO" DisableSpecificWarnings="4996" /> <Tool @@ -31,6 +32,7 @@ > <Tool Name="VCCLCompilerTool" + PreprocessorDefinitions="BZ_NO_STDIO" DisableSpecificWarnings="4996" /> <Tool |