n-api: move cleanup_hook to version 4

Update N-API to version 4 and move the `cleanup_hook` API into it.
nodejs · Jul 16, 2018 · 0d0f4d0 · 0d0f4d0
1 parent 210fea5
commit 0d0f4d0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/src/node_api.h b/src/node_api.h
@@ -623,6 +623,10 @@ NAPI_EXTERN napi_status napi_close_callback_scope(napi_env env,
 
 NAPI_EXTERN napi_status napi_fatal_exception(napi_env env, napi_value err);
 
+#endif  // NAPI_VERSION >= 3
+
+#if NAPI_VERSION >= 4
+
 NAPI_EXTERN napi_status napi_add_env_cleanup_hook(napi_env env,
                                                   void (*fun)(void* arg),
                                                   void* arg);
@@ -631,7 +635,7 @@ NAPI_EXTERN napi_status napi_remove_env_cleanup_hook(napi_env env,
                                                      void (*fun)(void* arg),
                                                      void* arg);
 
-#endif  // NAPI_VERSION >= 3
+#endif  // NAPI_VERSION >= 4
 
 #ifdef NAPI_EXPERIMENTAL
 

diff --git a/src/node_version.h b/src/node_version.h
@@ -114,6 +114,6 @@
 #define NODE_MODULE_VERSION 64
 
 // the NAPI_VERSION provided by this version of the runtime
-#define NAPI_VERSION  3
+#define NAPI_VERSION 4
 
 #endif  // SRC_NODE_VERSION_H_
diff --git a/test/addons-napi/test_cleanup_hook/binding.cc b/test/addons-napi/test_cleanup_hook/binding.cc
@@ -1,3 +1,4 @@
+#define NAPI_VERSION 4
 #include "node_api.h"
 #include "uv.h"
 #include "../common.h"

diff --git a/test/addons-napi/test_general/test.js b/test/addons-napi/test_general/test.js
@@ -33,8 +33,8 @@ assert.notStrictEqual(test_general.testGetPrototype(baseObject),
                       test_general.testGetPrototype(extendedObject));
 
 // test version management functions
-// expected version is currently 3
-assert.strictEqual(test_general.testGetVersion(), 3);
+// expected version is currently 4
+assert.strictEqual(test_general.testGetVersion(), 4);
 
 const [ major, minor, patch, release ] = test_general.testGetNodeVersion();
 assert.strictEqual(process.version.split('-')[0],