Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(208)

Side by Side Diff: src/ports/SkOSEnvironment.cpp

Issue 1835573002: [CMake fixes] Linux X11 pixel format and Windows compilation fix (Closed) Base URL: git@github.com:google/skia.git@master
Patch Set: added SkTypes.h Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cmake/SkUserConfig.h.in ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2015 Google Inc. 3 * Copyright 2015 Google Inc.
Marco A. 2016/03/25 14:31:11 As a sidenote, no idea why diff didn't work here.
mtklein 2016/03/25 15:16:10 Yes, I think this happens when you upload from Win
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 #include "SkOSEnvironment.h" 9 #include "SkOSEnvironment.h"
10 #include "SkTypes.h"
10 #include <stdlib.h> 11 #include <stdlib.h>
11 12
12 void sk_setenv(const char* key, const char* value) { 13 void sk_setenv(const char* key, const char* value) {
13 #ifdef SK_BUILD_FOR_WIN32 14 #ifdef SK_BUILD_FOR_WIN32
14 _putenv_s(key, value); 15 _putenv_s(key, value);
15 #else 16 #else
16 setenv(key, value, 1); 17 setenv(key, value, 1);
17 #endif 18 #endif
18 } 19 }
19 20
OLDNEW
« no previous file with comments | « cmake/SkUserConfig.h.in ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698