Make header guards consistent (#997)

9 files changed, 23 insertions, 26 deletions

diff --git a/src/binaryen-c.h b/src/binaryen-c.h
index 46ac79b31..c7c1d7292 100644
--- a/src/binaryen-c.h
+++ b/src/binaryen-c.h
@@ -41,8 +41,8 @@
 //
 //================
 
-#ifndef binaryen_h
-#define binaryen_h
+#ifndef wasm_binaryen_c_h
+#define wasm_binaryen_c_h
 
 #include <stddef.h>
 #include <stdint.h>
@@ -436,4 +436,4 @@ void BinaryenSetAPITracing(int on);
 } // extern "C"
 #endif
 
-#endif  // binaryen_h
+#endif // wasm_binaryen_c_h
diff --git a/src/pretty_printing.h b/src/pretty_printing.h
index 2a1a532dc..f1ba944f4 100644
--- a/src/pretty_printing.h
+++ b/src/pretty_printing.h
@@ -78,4 +78,4 @@ inline std::ostream& printMinorOpening(std::ostream &o, const char *str) {
   return o;
 }
 
-#endif //  wasm_pretty_printing_h
+#endif // wasm_pretty_printing_h
diff --git a/src/shared-constants.h b/src/shared-constants.h
index a3d8e4fda..31b5b7c18 100644
--- a/src/shared-constants.h
+++ b/src/shared-constants.h
@@ -61,4 +61,3 @@ extern Name GROW_WASM_MEMORY,
 } // namespace wasm
 
 #endif // wasm_shared_constants_h
-
diff --git a/src/wasm-builder.h b/src/wasm-builder.h
index 0f2c333f9..6b3f1a7d7 100644
--- a/src/wasm-builder.h
+++ b/src/wasm-builder.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef wasm_builder_h
-#define wasm_builder_h
+#ifndef wasm_wasm_builder_h
+#define wasm_wasm_builder_h
 
 #include <wasm.h>
 
@@ -378,4 +378,4 @@ public:
 
 } // namespace wasm
 
-#endif // wasm_builder_h
+#endif // wasm_wasm_builder_h
diff --git a/src/wasm-emscripten.h b/src/wasm-emscripten.h
index 07c470898..f9d2ae38c 100644
--- a/src/wasm-emscripten.h
+++ b/src/wasm-emscripten.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef wasm_emscripten_h
-#define wasm_emscripten_h
+#ifndef wasm_wasm_emscripten_h
+#define wasm_wasm_emscripten_h
 
 #include "wasm.h"
 
@@ -39,4 +39,4 @@ void generateEmscriptenMetadata(std::ostream& o,
 
 } // namespace wasm
 
-#endif // wasm_emscripten_h
+#endif // wasm_wasm_emscripten_h
diff --git a/src/wasm-linker.h b/src/wasm-linker.h
index 3700bb3ac..2129f4fd3 100644
--- a/src/wasm-linker.h
+++ b/src/wasm-linker.h
@@ -21,8 +21,8 @@
 // is no merging of multiple modules). Currently this is only inteded to turn
 // a .s file produced by LLVM into a usable wast file.
 
-#ifndef WASM_WASM_LINK_H
-#define WASM_WASM_LINK_H
+#ifndef wasm_wasm_linker_h
+#define wasm_wasm_linker_h
 
 #include "support/archive.h"
 #include "support/name.h"
@@ -331,6 +331,6 @@ class Linker {
   std::map<Address, cashew::IString> functionNames;
 };
 
-
 }
-#endif // WASM_WASM_LINK_H
+
+#endif // wasm_wasm_linker_h
diff --git a/src/wasm-module-building.h b/src/wasm-module-building.h
index 88efb7748..023a2d020 100644
--- a/src/wasm-module-building.h
+++ b/src/wasm-module-building.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef optimizing_incremental_module_builder_h
-#define optimizing_incremental_module_builder_h
+#ifndef wasm_wasm_module_building_h
+#define wasm_wasm_module_building_h
 
 #include <wasm.h>
 #include <support/threads.h>
@@ -288,5 +288,4 @@ private:
 
 } // namespace wasm
 
-#endif // optimizing_incremental_module_builder_h
-
+#endif // wasm_wasm_module_building_h
diff --git a/src/wasm-printing.h b/src/wasm-printing.h
index a445866d8..c8b44e394 100644
--- a/src/wasm-printing.h
+++ b/src/wasm-printing.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __wasm_printing_h__
-#define __wasm_printing_h__
+#ifndef wasm_wasm_printing_h
+#define wasm_wasm_printing_h
 
 #include <ostream>
 
@@ -54,5 +54,4 @@ inline std::ostream& operator<<(std::ostream& o, wasm::Expression* expression) {
 
 }
 
-#endif
-
+#endif // wasm_wasm_printing_h
diff --git a/src/wasm-traversal.h b/src/wasm-traversal.h
index db006858f..522f5092c 100644
--- a/src/wasm-traversal.h
+++ b/src/wasm-traversal.h
@@ -24,8 +24,8 @@
 //   struct MyVisitor : public WasmVisitor<MyVisitor> { .. }
 //
 
-#ifndef wasm_traversal_h
-#define wasm_traversal_h
+#ifndef wasm_wasm_traversal_h
+#define wasm_wasm_traversal_h
 
 #include "wasm.h"
 #include "support/threads.h"
@@ -662,4 +662,4 @@ struct LinearExecutionWalker : public PostWalker<SubType, VisitorType> {
 
 } // namespace wasm
 
-#endif // wasm_traversal_h
+#endif // wasm_wasm_traversal_h