Fix / uniformize include guards

6 files changed, 22 insertions, 12 deletions

diff --git a/src/emscripten-optimizer/colors.h b/src/emscripten-optimizer/colors.h
index 6e2c6f7d8..c3f48113f 100644
--- a/src/emscripten-optimizer/colors.h
+++ b/src/emscripten-optimizer/colors.h
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+#ifndef wasm_color_h
+#define wasm_color_h
+
 #include <unistd.h>
 #include <cstdlib>
 #include <ostream>
@@ -73,3 +76,5 @@ namespace Colors {
 #endif
   }
 };
+
+#endif // wasm_color_h
diff --git a/src/emscripten-optimizer/istring.h b/src/emscripten-optimizer/istring.h
index ffcec2fce..d114540e2 100644
--- a/src/emscripten-optimizer/istring.h
+++ b/src/emscripten-optimizer/istring.h
@@ -16,8 +16,8 @@
 
 // Interned String type, 100% interned on creation. Comparisons are always just a pointer comparison
 
-#ifndef __istring_h__
-#define __istring_h__
+#ifndef wasm_istring_h
+#define wasm_istring_h
 
 #include <unordered_set>
 #include <unordered_map>
@@ -173,4 +173,4 @@ public:
 
 } // namespace cashew
 
-#endif // __istring_h__
+#endif // wasm_istring_h
diff --git a/src/emscripten-optimizer/optimizer.h b/src/emscripten-optimizer/optimizer.h
index 5e4692f12..451a9e286 100644
--- a/src/emscripten-optimizer/optimizer.h
+++ b/src/emscripten-optimizer/optimizer.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __optimizer_h__
-#define __optimizer_h__
+#ifndef wasm_optimizer_h
+#define wasm_optimizer_h
 
 #include "simple_ast.h"
 
@@ -157,4 +157,4 @@ cashew::Ref makeAsmCoercion(cashew::Ref node, AsmType type);
 
 cashew::Ref makeSigning(cashew::Ref node, AsmSign sign);
 
-#endif // __optimizer_h__
+#endif // wasm_optimizer_h
diff --git a/src/emscripten-optimizer/parser.h b/src/emscripten-optimizer/parser.h
index 2b2effcab..6b2fa2faa 100644
--- a/src/emscripten-optimizer/parser.h
+++ b/src/emscripten-optimizer/parser.h
@@ -19,8 +19,8 @@
 // XXX All parsing methods assume they take ownership of the input string. This lets them reuse
 //     parts of it. You will segfault if the input string cannot be reused and written to.
 
-#ifndef __parser_h__
-#define __parser_h__
+#ifndef wasm_parser_h
+#define wasm_parser_h
 
 #include <vector>
 #include <iostream>
@@ -927,4 +927,4 @@ public:
 
 } // namespace cashew
 
-#endif // __parser_h__
+#endif // wasm_parser_h
diff --git a/src/emscripten-optimizer/simple_ast.h b/src/emscripten-optimizer/simple_ast.h
index a6073d9af..862e1f0bc 100644
--- a/src/emscripten-optimizer/simple_ast.h
+++ b/src/emscripten-optimizer/simple_ast.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __simple_ast_h__
-#define __simple_ast_h__
+#ifndef wasm_simple_ast_h
+#define wasm_simple_ast_h
 
 #include <assert.h>
 #include <stdlib.h>
@@ -1678,4 +1678,4 @@ public:
 
 } // namespace cashew
 
-#endif // __simple_ast_h__
+#endif // wasm_simple_ast_h
diff --git a/src/emscripten-optimizer/snprintf.h b/src/emscripten-optimizer/snprintf.h
index 8f4a690ca..86335661d 100644
--- a/src/emscripten-optimizer/snprintf.h
+++ b/src/emscripten-optimizer/snprintf.h
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+#ifndef wasm_snprintf_h
+#define wasm_snprintf_h
+
 #include <stdarg.h>
 
 // Visual Studio does not support C99, so emulate snprintf support for it manually.
@@ -46,3 +49,5 @@ inline int c99_snprintf(char* str, size_t size, const char* format, ...)
 	return count;
 }
 #endif
+
+#endif // wasm_snprintf_h