diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 19:44:25 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 19:44:25 -0800 |
| commit | 5015fe9bf8869e794cfd972189876e5ff67a3a77 (patch) | |
| tree | ac5fbd6139872dbaabf3c3fa01d1ad3af441d72f /linker/linker_environ.h | |
| parent | 7f687eb12e9977215416469c3edfc9f464a5883c (diff) | |
| parent | f29c214d6ad97f9a5348407cc66a58aec2228ca9 (diff) | |
| download | bionic-5015fe9bf8869e794cfd972189876e5ff67a3a77.zip bionic-5015fe9bf8869e794cfd972189876e5ff67a3a77.tar.gz bionic-5015fe9bf8869e794cfd972189876e5ff67a3a77.tar.bz2 | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/bionic into mr1
Conflicts:
libc/Android.mk
libc/bionic/system_properties.c
libc/kernel/common/linux/msm_mdp.h
libc/tools/gensyscalls.py
libm/Android.mk
linker/linker.c
Change-Id: I11944300d7fcf2fd9dc587d8c7a937bf5366bcc0
Diffstat (limited to 'linker/linker_environ.h')
| -rw-r--r-- | linker/linker_environ.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/linker/linker_environ.h b/linker/linker_environ.h index 98ad1de..d5f75a1 100644 --- a/linker/linker_environ.h +++ b/linker/linker_environ.h @@ -28,6 +28,10 @@ #ifndef LINKER_ENVIRON_H #define LINKER_ENVIRON_H +#ifdef __cplusplus +extern "C" { +#endif + /* Call this function before anything else. 'vecs' must be the pointer * to the environment block in the ELF data block. The function returns * the start of the aux vectors after the env block. @@ -47,8 +51,12 @@ extern void linker_env_unset(const char* name); * after this function. */ extern const char* linker_env_get(const char* name); -/* Remove unsecure environment variables. This should be used when +/* Remove insecure environment variables. This should be used when * running setuid programs. */ extern void linker_env_secure(void); +#ifdef __cplusplus +}; +#endif + #endif /* LINKER_ENVIRON_H */ |