Merge branch 'sverk/maps-erl_interface'

* sverk/maps-erl_interface:
  erts: Add distribution capability flag for maps DFLAG_MAP_TAG
  erts: Change external format for maps
  erts: Document external format for maps (MAP_EXT)
  erl_interface: Add test for ei_skip_term of container terms
  erl_interface: Add map support in ei_skip_term
  erl_interface: Fix mem leak in ei_decode_encode_test
  erl_interface: test decode/encode of maps
  erl_interface: Add ei encode/decode for maps
  erl_interface: test decode_encode of tuples and lists
  erl_interface: refactor ei_decode_encode_test.c

1 files changed, 2 insertions, 1 deletions

diff --git a/lib/erl_interface/src/connect/ei_connect_int.h b/lib/erl_interface/src/connect/ei_connect_int.h
index 42ab9b58d7..8fab47a787 100644
--- a/lib/erl_interface/src/connect/ei_connect_int.h
+++ b/lib/erl_interface/src/connect/ei_connect_int.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2001-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2014. All Rights Reserved.
  *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -104,6 +104,7 @@ extern int h_errno;
 #define DFLAG_NEW_FLOATS          0x800
 #define DFLAG_SMALL_ATOM_TAGS     0x4000
 #define DFLAG_UTF8_ATOMS          0x10000
+#define DFLAG_MAP_TAG             0x20000
 
 ei_cnode   *ei_fd_to_cnode(int fd);
 int         ei_distversion(int fd);