4 files changed, 73 insertions, 49 deletions
diff --git a/src/emscripten-optimizer/colors.h b/src/emscripten-optimizer/colors.h
deleted file mode 100644
index bd12f0c6b..000000000
--- a/src/emscripten-optimizer/colors.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2015 WebAssembly Community Group participants
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef wasm_color_h
-#define wasm_color_h
-
-#include <cstdlib>
-#include <ostream>
-
-#if defined(__linux__) || defined(__apple__)
-#include <unistd.h>
-
-namespace Colors {
-  inline void outputColorCode(std::ostream& stream,const char* colorCode) {
-    if((getenv("COLORS") && getenv("COLORS")[0] == '1') || // forced
-           (isatty(STDOUT_FILENO) && (!getenv("COLORS") || getenv("COLORS")[0] != '0'))) { // implicit
-      stream << colorCode;
-    }
-  }
-#else
-namespace Colors {
-  inline void outputColorCode(std::ostream& stream,const char* colorCode) {}
-#endif
-
-  inline void normal(std::ostream& stream) { outputColorCode(stream,"\033[0m"); }
-  inline void red(std::ostream& stream) { outputColorCode(stream,"\033[31m"); }
-  inline void magenta(std::ostream& stream) { outputColorCode(stream,"\033[35m"); }
-  inline void orange(std::ostream& stream) { outputColorCode(stream,"\033[33m"); }
-  inline void grey(std::ostream& stream) { outputColorCode(stream,"\033[37m"); }
-  inline void green(std::ostream& stream) { outputColorCode(stream,"\033[32m"); }
-  inline void blue(std::ostream& stream) { outputColorCode(stream,"\033[34m"); }
-  inline void bold(std::ostream& stream) { outputColorCode(stream,"\033[1m"); }
-};
-
-#endif // wasm_color_h
diff --git a/src/pretty_printing.h b/src/pretty_printing.h
index 29b2bdea7..f0a233d69 100644
--- a/src/pretty_printing.h
+++ b/src/pretty_printing.h
@@ -23,7 +23,7 @@
 
 #include <ostream>
 
-#include "emscripten-optimizer/colors.h"
+#include "support/colors.h"
 
 inline std::ostream &doIndent(std::ostream &o, unsigned indent) {
   for (unsigned i = 0; i < indent; i++) {
diff --git a/src/support/colors.cpp b/src/support/colors.cpp
new file mode 100644
index 000000000..aca720514
--- /dev/null
+++ b/src/support/colors.cpp
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2015 WebAssembly Community Group participants
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "support/colors.h"
+
+#include <cstdlib>
+#include <ostream>
+
+#if defined(__linux__) || defined(__apple__)
+# define CAN_HAZ_COLOR 1
+# include <unistd.h>
+#endif
+
+namespace Colors {
+void outputColorCode(std::ostream& stream, const char* colorCode) {
+#if defined(CAN_HAZ_COLOR)
+  const static bool has_color = []() {
+    return (getenv("COLORS") && getenv("COLORS")[0] == '1') ||  // forced
+           (isatty(STDOUT_FILENO) &&
+            (!getenv("COLORS") || getenv("COLORS")[0] != '0'));  // implicit
+  }();
+  if (has_color) stream << colorCode;
+#endif
+}
+}  // namespace Colors
diff --git a/src/support/colors.h b/src/support/colors.h
new file mode 100644
index 000000000..bdef31ec3
--- /dev/null
+++ b/src/support/colors.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015 WebAssembly Community Group participants
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef wasm_color_h
+#define wasm_color_h
+
+#include <iosfwd>
+
+namespace Colors {
+void outputColorCode(std::ostream&stream, const char *colorCode);
+inline void normal(std::ostream& stream) { outputColorCode(stream,"\033[0m"); }
+inline void red(std::ostream& stream) { outputColorCode(stream,"\033[31m"); }
+inline void magenta(std::ostream& stream) { outputColorCode(stream,"\033[35m"); }
+inline void orange(std::ostream& stream) { outputColorCode(stream,"\033[33m"); }
+inline void grey(std::ostream& stream) { outputColorCode(stream,"\033[37m"); }
+inline void green(std::ostream& stream) { outputColorCode(stream,"\033[32m"); }
+inline void blue(std::ostream& stream) { outputColorCode(stream,"\033[34m"); }
+inline void bold(std::ostream& stream) { outputColorCode(stream,"\033[1m"); }
+};
+
+#endif // wasm_color_h