aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_nif.h
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-06-01 15:59:56 +0200
committerSverker Eriksson <[email protected]>2015-06-01 15:59:56 +0200
commit76784c1f41c9138397a63a6cfc1ac3e2a50249ef (patch)
treee171205c9600ea77bc626e1ba53c48b1e6d10191 /erts/emulator/beam/erl_nif.h
parent8260f916c2ab9b9dff9752b47e47d07ac3d95c92 (diff)
parenta519a52617a6a5bbdb8b17bdd892ab012cf8080b (diff)
downloadotp-76784c1f41c9138397a63a6cfc1ac3e2a50249ef.tar.gz
otp-76784c1f41c9138397a63a6cfc1ac3e2a50249ef.tar.bz2
otp-76784c1f41c9138397a63a6cfc1ac3e2a50249ef.zip
Merge branch 'sverk/nif-map-docs'
* sverk/nif-map-docs: erts: Cleanup fsummary lines in erl_nif docs erts: Fix alphabetic order in erl_nif doc erts: Add docs for map functions in nif API erts: Rename ErlNifMapIteratorEntry enums
Diffstat (limited to 'erts/emulator/beam/erl_nif.h')
-rw-r--r--erts/emulator/beam/erl_nif.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_nif.h b/erts/emulator/beam/erl_nif.h
index c4fdfd4187..af806736fd 100644
--- a/erts/emulator/beam/erl_nif.h
+++ b/erts/emulator/beam/erl_nif.h
@@ -218,8 +218,12 @@ typedef struct /* All fields all internal and may change */
} ErlNifMapIterator;
typedef enum {
- ERL_NIF_MAP_ITERATOR_HEAD = 1,
- ERL_NIF_MAP_ITERATOR_TAIL = 2
+ ERL_NIF_MAP_ITERATOR_FIRST = 1,
+ ERL_NIF_MAP_ITERATOR_LAST = 2,
+
+ /* deprecated synonyms (undocumented in 17 and 18-rc) */
+ ERL_NIF_MAP_ITERATOR_HEAD = ERL_NIF_MAP_ITERATOR_FIRST,
+ ERL_NIF_MAP_ITERATOR_TAIL = ERL_NIF_MAP_ITERATOR_LAST
} ErlNifMapIteratorEntry;
#if (defined(__WIN32__) || defined(_WIN32) || defined(_WIN32_))