Merge pull request #3411 from tautschnig/miniz-no-clang-format

tautschnig · web-flow · commit ce9c8f12b22c · 2018-11-15T08:30:44.000Z
Disable clang-format for imported miniz code [blocks: #2548]
diff --git a/jbmc/src/miniz/miniz.cpp b/jbmc/src/miniz/miniz.cpp
@@ -24,6 +24,9 @@
  *
  **************************************************************************/
 
+// this is imported code, don't impose formatting rules
+// clang-format off
+
 #ifdef _MSC_VER
 #pragma warning(disable:4548)
   // expression before comma has no effect
@@ -7194,3 +7197,4 @@ mz_bool mz_zip_end(mz_zip_archive *pZip)
 #ifdef __cplusplus
 }
 #endif
+// clang-format on

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,9 @@`
`24`	`24`	`*`
`25`	`25`	`**************************************************************************/`
`26`	`26`
	`27`	`+// this is imported code, don't impose formatting rules`
	`28`	`+// clang-format off`
	`29`	`+`
`27`	`30`	`#ifdef _MSC_VER`
`28`	`31`	`#pragma warning(disable:4548)`
`29`	`32`	`// expression before comma has no effect`
`@@ -7194,3 +7197,4 @@ mz_bool mz_zip_end(mz_zip_archive *pZip)`
`7194`	`7197`	`#ifdef __cplusplus`
`7195`	`7198`	`}`
`7196`	`7199`	`#endif`
	`7200`	`+// clang-format on`