You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/02/12 07:23:15 UTC
[05/15] snappy commit: updated refs/heads/import-master to 64cd135
Fix compatibility with R13B04
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1098719 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/couchdb-snappy/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-snappy/commit/64f9f0c4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-snappy/tree/64f9f0c4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-snappy/diff/64f9f0c4
Branch: refs/heads/import-master
Commit: 64f9f0c4ece649c476dd63b6629a659d27825334
Parents: b5535a5
Author: Paul Joseph Davis <da...@apache.org>
Authored: Mon May 2 18:27:47 2011 +0000
Committer: Paul Joseph Davis <da...@apache.org>
Committed: Mon May 2 18:27:47 2011 +0000
----------------------------------------------------------------------
erl_nif_compat.h | 8 ++++++++
snappy_nif.cc | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-snappy/blob/64f9f0c4/erl_nif_compat.h
----------------------------------------------------------------------
diff --git a/erl_nif_compat.h b/erl_nif_compat.h
index b6e4453..b8eb9b0 100644
--- a/erl_nif_compat.h
+++ b/erl_nif_compat.h
@@ -53,6 +53,9 @@ extern "C" {
#define enif_priv_data_compat enif_get_data
#define enif_make_uint_compat enif_make_ulong
+#define enif_make_existing_atom_compat(E, N, R, Enc) \
+ enif_make_existing_atom(E, N, R)
+
#define enif_make_string_compat(E, B, Enc) \
enif_make_string(E, B)
@@ -74,6 +77,10 @@ extern "C" {
#define enif_make_string_compat enif_make_string
#define enif_make_uint_compat enif_make_uint
+#define enif_make_existing_atom_compat(E, N, R, Enc) \
+ enif_make_existing_atom(E, N, R)
+
+
#endif /* R13B04 */
@@ -109,6 +116,7 @@ extern "C" {
#define enif_priv_data_compat enif_priv_data
#define enif_make_string_compat enif_make_string
+#define enif_make_existing_atom_compat enif_make_existing_atom
#define enif_make_uint_compat enif_make_uint
#endif /* R14 and future releases */
http://git-wip-us.apache.org/repos/asf/couchdb-snappy/blob/64f9f0c4/snappy_nif.cc
----------------------------------------------------------------------
diff --git a/snappy_nif.cc b/snappy_nif.cc
index 12bd6e1..76409c8 100644
--- a/snappy_nif.cc
+++ b/snappy_nif.cc
@@ -111,7 +111,7 @@ ERL_NIF_TERM
make_atom(ErlNifEnv* env, const char* name)
{
ERL_NIF_TERM ret;
- if(enif_make_existing_atom(env, name, &ret, ERL_NIF_LATIN1)) {
+ if(enif_make_existing_atom_compat(env, name, &ret, ERL_NIF_LATIN1)) {
return ret;
}
return enif_make_atom(env, name);
@@ -262,4 +262,4 @@ static ErlNifFunc nif_functions[] = {
ERL_NIF_INIT(snappy, nif_functions, &on_load, &on_reload, &on_upgrade, NULL);
-END_C
\ No newline at end of file
+END_C