couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r1098719 - in /couchdb/trunk/src/snappy: erl_nif_compat.h snappy_nif.cc
Date Mon, 02 May 2011 18:27:47 GMT
Author: davisp
Date: Mon May  2 18:27:47 2011
New Revision: 1098719

URL: http://svn.apache.org/viewvc?rev=1098719&view=rev
Log:
Fix compatibility with R13B04


Modified:
    couchdb/trunk/src/snappy/erl_nif_compat.h
    couchdb/trunk/src/snappy/snappy_nif.cc

Modified: couchdb/trunk/src/snappy/erl_nif_compat.h
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/snappy/erl_nif_compat.h?rev=1098719&r1=1098718&r2=1098719&view=diff
==============================================================================
--- couchdb/trunk/src/snappy/erl_nif_compat.h (original)
+++ couchdb/trunk/src/snappy/erl_nif_compat.h Mon May  2 18:27:47 2011
@@ -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 */

Modified: couchdb/trunk/src/snappy/snappy_nif.cc
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/snappy/snappy_nif.cc?rev=1098719&r1=1098718&r2=1098719&view=diff
==============================================================================
--- couchdb/trunk/src/snappy/snappy_nif.cc (original)
+++ couchdb/trunk/src/snappy/snappy_nif.cc Mon May  2 18:27:47 2011
@@ -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



Mime
View raw message