modules/brotli/clang-cl-exceptions.patch
author Dragana Damjanovic <dd.mozilla@gmail.com>
Tue, 25 Apr 2017 15:08:55 +0200
changeset 354817 1426ecc8209defd3fc9ac76170a7b9e6b416ff90
parent 353707 55cb8ab2f8466b99cf88d6c59d2ab151b89065e9
permissions -rw-r--r--
Bug 1188435 - Fix http2 restart on net-reset and fix activeConn count. r=mcmanus

diff --git a/tools/bro.cc b/tools/bro.cc
index b254f0ffdb08..30d9858a95b3 100644
--- a/tools/bro.cc
+++ b/tools/bro.cc
@@ -282,29 +282,34 @@ int main(int argc, char** argv) {
     FILE* fin = OpenInputFile(input_path);
     FILE* fout = OpenOutputFile(output_path, force);
     if (decompress) {
       Decompresss(fin, fout);
     } else {
       brotli::BrotliParams params;
       params.lgwin = lgwin;
       params.quality = quality;
+/* clang-cl doesn't like exceptions */
+#if !defined(_MSC_VER) || !defined(__clang__)
       try {
+#endif
         brotli::BrotliFileIn in(fin, 1 << 16);
         brotli::BrotliFileOut out(fout);
         if (!BrotliCompress(params, &in, &out)) {
           fprintf(stderr, "compression failed\n");
           unlink(output_path);
           exit(1);
         }
+#if !defined(_MSC_VER) || !defined(__clang__)
       } catch (std::bad_alloc&) {
         fprintf(stderr, "not enough memory\n");
         unlink(output_path);
         exit(1);
       }
+#endif
     }
     if (fclose(fin) != 0) {
       perror("fclose");
       exit(1);
     }
     if (fclose(fout) != 0) {
       perror("fclose");
       exit(1);