[CMake fixes] Linux X11 pixel format and Windows compilation fix

src/ports/SkOSEnvironment.cpp

Index: src/ports/SkOSEnvironment.cpp
diff --git a/src/ports/SkOSEnvironment.cpp b/src/ports/SkOSEnvironment.cpp
index cc7aa18cff7f32ee5a9b0f99bdc186c4a8f0825e..f2483124c51c8f8c5fefc0d617c890360aac3f85 100644
--- a/src/ports/SkOSEnvironment.cpp
+++ b/src/ports/SkOSEnvironment.cpp
@@ -1,19 +1,20 @@
-
-/*
- * Copyright 2015 Google Inc.

[Marco A., 2016/03/25 14:31:11]

As a sidenote, no idea why diff didn't work here. Newline formats perhaps?

[mtklein, 2016/03/25 15:16:10]

Yes, I think this happens when you upload from Windows.  The side-by-side diff
link works.

- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkOSEnvironment.h"
-#include <stdlib.h>
-
-void sk_setenv(const char* key, const char* value) {
-#ifdef SK_BUILD_FOR_WIN32
-    _putenv_s(key, value);
-#else
-    setenv(key, value, 1);
-#endif
-}
-
+
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkOSEnvironment.h"
+#include "SkTypes.h"
+#include <stdlib.h>
+
+void sk_setenv(const char* key, const char* value) {
+#ifdef SK_BUILD_FOR_WIN32
+    _putenv_s(key, value);
+#else
+    setenv(key, value, 1);
+#endif
+}
+