OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2014 The Native Client Authors. All rights reserved. | 2 * Copyright (c) 2014 The Native Client Authors. All rights reserved. |
3 * Use of this source code is governed by a BSD-style license that can be | 3 * Use of this source code is governed by a BSD-style license that can be |
4 * found in the LICENSE file. | 4 * found in the LICENSE file. |
5 */ | 5 */ |
6 | 6 |
7 #include "native_client/src/trusted/service_runtime/sel_main_common.h" | 7 #include "native_client/src/trusted/service_runtime/sel_main_common.h" |
| 8 #include "native_client/src/include/nacl_defines.h" |
8 | 9 |
9 #if NACL_OSX | 10 #if NACL_OSX |
10 #include <crt_externs.h> | 11 #include <crt_externs.h> |
11 #endif | 12 #endif |
12 | 13 |
13 #include "native_client/src/shared/platform/nacl_check.h" | 14 #include "native_client/src/shared/platform/nacl_check.h" |
14 #include "native_client/src/trusted/service_runtime/sel_ldr.h" | 15 #include "native_client/src/trusted/service_runtime/sel_ldr.h" |
15 | 16 |
16 NaClErrorCode NaClMainLoadIrt(struct NaClApp *nap, struct NaClDesc *nd, | 17 NaClErrorCode NaClMainLoadIrt(struct NaClApp *nap, struct NaClDesc *nd, |
17 struct NaClValidationMetadata *metadata) { | 18 struct NaClValidationMetadata *metadata) { |
(...skipping 14 matching lines...) Expand all Loading... |
32 /* Mac dynamic libraries cannot access the environ variable directly. */ | 33 /* Mac dynamic libraries cannot access the environ variable directly. */ |
33 envp = (const char **) *_NSGetEnviron(); | 34 envp = (const char **) *_NSGetEnviron(); |
34 #else | 35 #else |
35 /* Overzealous code style check is overzealous. */ | 36 /* Overzealous code style check is overzealous. */ |
36 /* @IGNORE_LINES_FOR_CODE_HYGIENE[1] */ | 37 /* @IGNORE_LINES_FOR_CODE_HYGIENE[1] */ |
37 extern char **environ; | 38 extern char **environ; |
38 envp = (const char **) environ; | 39 envp = (const char **) environ; |
39 #endif | 40 #endif |
40 return envp; | 41 return envp; |
41 } | 42 } |
OLD | NEW |