aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2014-01-31 11:04:03 +0100
committerBjörn-Egil Dahlberg <[email protected]>2014-01-31 11:04:03 +0100
commiteec1d22c5aef21ad4606c79465084bbff46d42ee (patch)
treeecc793ed64e6132f80d9016c5695d50be1b2787e
parentfdcdaca338849d7f63d4300e489318f6ee275d82 (diff)
parent002c3ee0d069acfab0148258b1e59014e0a74aa9 (diff)
downloadotp-eec1d22c5aef21ad4606c79465084bbff46d42ee.tar.gz
otp-eec1d22c5aef21ad4606c79465084bbff46d42ee.tar.bz2
otp-eec1d22c5aef21ad4606c79465084bbff46d42ee.zip
Merge branch 'ks/stdlib/maps-no_native'
* ks/stdlib/maps-no_native: Allow making the system with --enable-native-libs
-rw-r--r--lib/stdlib/src/io_lib_pretty.erl2
-rw-r--r--lib/stdlib/src/maps.erl2
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/stdlib/src/io_lib_pretty.erl b/lib/stdlib/src/io_lib_pretty.erl
index f02a7921f8..9005fede4d 100644
--- a/lib/stdlib/src/io_lib_pretty.erl
+++ b/lib/stdlib/src/io_lib_pretty.erl
@@ -25,6 +25,8 @@
-export([print/1,print/2,print/3,print/4,print/5,print/6]).
+-compile(no_native).
+
%%%
%%% Exported functions
%%%
diff --git a/lib/stdlib/src/maps.erl b/lib/stdlib/src/maps.erl
index 41de174e7d..57b5072639 100644
--- a/lib/stdlib/src/maps.erl
+++ b/lib/stdlib/src/maps.erl
@@ -43,6 +43,8 @@
values/1
]).
+-compile(no_native).
+
%% Shadowed by erl_bif_types: maps:get/3
-spec get(Key,Map) -> Value when
Key :: term(),