Skip to content

Commit

Permalink
Fix remaining rebasing difference
Browse files Browse the repository at this point in the history
  • Loading branch information
Sampson Gao committed Sep 15, 2017
1 parent 90ef051 commit b0175ae
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion doc/api/n-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ thrown to immediately terminate the process.
added: v8.2.0
-->
```C
NAPI_EXTERN NAPI_NO_RETURN void napi_fatal_error(const char* location,
NAPI_NO_RETURN void napi_fatal_error(const char* location,
size_t location_len,
const char* message,
size_t message_len);
Expand Down
4 changes: 3 additions & 1 deletion test/addons-napi/test_function/test_function.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ napi_value TestCallFunction(napi_env env, napi_callback_info info) {

void TestFunctionName(napi_env env, napi_callback_info info) {}

void Init(napi_env env, napi_value exports, napi_value module, void* priv) {
napi_value Init(napi_env env, napi_value exports) {
napi_value fn1;
NAPI_CALL(env, napi_create_function(
env, NULL, -1, TestCallFunction, NULL, &fn1));
Expand All @@ -44,6 +44,8 @@ void Init(napi_env env, napi_value exports, napi_value module, void* priv) {
NAPI_CALL(env, napi_set_named_property(env, exports, "TestCall", fn1));
NAPI_CALL(env, napi_set_named_property(env, exports, "TestName", fn2));
NAPI_CALL(env, napi_set_named_property(env, exports, "TestNameShort", fn3));

return exports;
}

NAPI_MODULE(NODE_GYP_MODULE_NAME, Init)

0 comments on commit b0175ae

Please sign in to comment.