diff options
| author | Sverker Eriksson <[email protected]> | 2015-11-27 12:18:49 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-11-27 12:18:49 +0100 |
| commit | 80bbe3b23ad7781e43dfea3a84203956ccab6a10 (patch) | |
| tree | d038b2b296d373ca55818cdb7b7688f95dbf566f /erts/doc | |
| parent | 29f453a3b2af49cd8f2052959262fc3be8971c46 (diff) | |
| parent | b916edc72a8eb82068229222abde1b9ff43dbad2 (diff) | |
| download | otp-80bbe3b23ad7781e43dfea3a84203956ccab6a10.tar.gz otp-80bbe3b23ad7781e43dfea3a84203956ccab6a10.tar.bz2 otp-80bbe3b23ad7781e43dfea3a84203956ccab6a10.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/doc')
| -rw-r--r-- | erts/doc/src/erl_driver.xml | 4 | ||||
| -rw-r--r-- | erts/doc/src/erl_nif.xml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/erts/doc/src/erl_driver.xml b/erts/doc/src/erl_driver.xml index f7b4187b80..e81d38cb80 100644 --- a/erts/doc/src/erl_driver.xml +++ b/erts/doc/src/erl_driver.xml @@ -2809,7 +2809,7 @@ ERL_DRV_MAP int sz </func> <func> - <name><ret>int</ret><nametext>erl_drv_putenv(char *key, char *value)</nametext></name> + <name><ret>int</ret><nametext>erl_drv_putenv(const char *key, char *value)</nametext></name> <fsummary>Set the value of an environment variable</fsummary> <desc> <marker id="erl_drv_putenv"></marker> @@ -2838,7 +2838,7 @@ ERL_DRV_MAP int sz </desc> </func> <func> - <name><ret>int</ret><nametext>erl_drv_getenv(char *key, char *value, size_t *value_size)</nametext></name> + <name><ret>int</ret><nametext>erl_drv_getenv(const char *key, char *value, size_t *value_size)</nametext></name> <fsummary>Get the value of an environment variable</fsummary> <desc> <marker id="erl_drv_getenv"></marker> diff --git a/erts/doc/src/erl_nif.xml b/erts/doc/src/erl_nif.xml index dae14b8d08..2d8706169f 100644 --- a/erts/doc/src/erl_nif.xml +++ b/erts/doc/src/erl_nif.xml @@ -791,6 +791,10 @@ typedef enum { and return true, or return false if <c>term</c> is not an unsigned integer or is outside the bounds of type <c>unsigned long</c>.</p></desc> </func> + <func><name><ret>int</ret><nametext>enif_getenv(const char* key, char* value, size_t *value_size)</nametext></name> + <fsummary>Get the value of an environment variable</fsummary> + <desc><p>Same as <seealso marker="erl_driver#erl_drv_getenv">erl_drv_getenv</seealso>.</p></desc> + </func> <func><name><ret>int</ret><nametext>enif_has_pending_exception(ErlNifEnv* env, ERL_NIF_TERM* reason)</nametext></name> <fsummary>Check if an exception has been raised</fsummary> <desc><p>Return true if a pending exception is associated |