aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_nif.h
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2014-01-14 18:22:34 +0100
committerBjörn-Egil Dahlberg <[email protected]>2014-01-29 11:08:44 +0100
commitb8a7203f04a1ed6d2756e6b782cd4c95a8c7c491 (patch)
tree599a15401a416628dd7dc16ae98df0158f74c6ce /erts/emulator/beam/erl_nif.h
parentc8ecb6962a923ceb0b7e599d22adef773d042e4a (diff)
downloadotp-b8a7203f04a1ed6d2756e6b782cd4c95a8c7c491.tar.gz
otp-b8a7203f04a1ed6d2756e6b782cd4c95a8c7c491.tar.bz2
otp-b8a7203f04a1ed6d2756e6b782cd4c95a8c7c491.zip
erts: Increase version for NIF API and reject experimental v2.5
Diffstat (limited to 'erts/emulator/beam/erl_nif.h')
-rw-r--r--erts/emulator/beam/erl_nif.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/erts/emulator/beam/erl_nif.h b/erts/emulator/beam/erl_nif.h
index 3c1e13f8a4..ae7f63f923 100644
--- a/erts/emulator/beam/erl_nif.h
+++ b/erts/emulator/beam/erl_nif.h
@@ -38,11 +38,13 @@
** 2.2: R14B03 enif_is_exception
** 2.3: R15 enif_make_reverse_list, enif_is_number
** 2.4: R16 enif_consume_timeslice
+** 2.5: First experimental maps API additions (libs of this version is not compatible with any other VM)
** 2.5: R17 Maps API additions
+** 2.6: R17 with maps
** R17 dirty schedulers
*/
#define ERL_NIF_MAJOR_VERSION 2
-#define ERL_NIF_MINOR_VERSION 5
+#define ERL_NIF_MINOR_VERSION 6
#include <stdlib.h>
@@ -165,7 +167,6 @@ typedef int ErlNifTSDKey;
typedef ErlDrvThreadOpts ErlNifThreadOpts;
-<<<<<<< HEAD
#ifdef ERL_NIF_DIRTY_SCHEDULER_SUPPORT
typedef enum
{
@@ -173,7 +174,7 @@ typedef enum
ERL_NIF_DIRTY_JOB_IO_BOUND = 2
}ErlNifDirtyTaskFlags;
#endif
-=======
+
typedef struct
{
/* use a lot of memory, structure may change */
@@ -190,8 +191,6 @@ typedef enum {
ERL_NIF_MAP_ITERATOR_TAIL = 2
} ErlNifMapIteratorEntry;
->>>>>>> erts: Add NIFs for Maps
-
#if (defined(__WIN32__) || defined(_WIN32) || defined(_WIN32_))
# define ERL_NIF_API_FUNC_DECL(RET_TYPE, NAME, ARGS) RET_TYPE (*NAME) ARGS
typedef struct {