diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-11-14 10:50:06 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-11-14 10:50:06 +0100 |
| commit | d30cee99c662bf030ce035e56e342d7ebf155513 (patch) | |
| tree | 7ab4b2cfbca419cd6bcc09fdee243b24deb7e6af /erts/emulator/hipe/hipe_bif_list.m4 | |
| parent | 24797b6ba55cfd83438381234c3108540ea29acb (diff) | |
| parent | 55c2b0b6d55fe6a011671832b5529cb1c7b636a8 (diff) | |
| download | otp-d30cee99c662bf030ce035e56e342d7ebf155513.tar.gz otp-d30cee99c662bf030ce035e56e342d7ebf155513.tar.bz2 otp-d30cee99c662bf030ce035e56e342d7ebf155513.zip | |
Merge remote branch 'upstream/maint'
Conflicts:
lib/ssl/src/ssl_connection.erl
Diffstat (limited to 'erts/emulator/hipe/hipe_bif_list.m4')
| -rw-r--r-- | erts/emulator/hipe/hipe_bif_list.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/hipe/hipe_bif_list.m4 b/erts/emulator/hipe/hipe_bif_list.m4 index d9aa09b79e..ea4f68ef24 100644 --- a/erts/emulator/hipe/hipe_bif_list.m4 +++ b/erts/emulator/hipe/hipe_bif_list.m4 @@ -246,7 +246,7 @@ noproc_primop_interface_5(nbif_bs_put_big_integer, hipe_bs_put_big_integer) gc_bif_interface_0(nbif_check_get_msg, hipe_check_get_msg) -#ifdef NO_FPE_SIGNALS +#`ifdef' NO_FPE_SIGNALS nocons_nofail_primop_interface_0(nbif_emulate_fpe, hipe_emulate_fpe) #endif |