diff options
author | isaacs <i@izs.me> | 2019-07-24 23:00:03 -0700 |
---|---|---|
committer | Michaƫl Zasso <targos@protonmail.com> | 2019-08-06 09:05:32 +0200 |
commit | d7d321b071789f08c65dbb11a0e4b3b6a299af44 (patch) | |
tree | 1015b8c5da3632fc986b56051a4853ac946c56f4 /deps/npm/node_modules/node-gyp/src/win_delay_load_hook.cc | |
parent | 37d27486fce50bd82b6b5095af880d435ed308f8 (diff) | |
download | android-node-v8-d7d321b071789f08c65dbb11a0e4b3b6a299af44.tar.gz android-node-v8-d7d321b071789f08c65dbb11a0e4b3b6a299af44.tar.bz2 android-node-v8-d7d321b071789f08c65dbb11a0e4b3b6a299af44.zip |
deps: upgrade npm to 6.10.2
PR-URL: https://github.com/nodejs/node/pull/28853
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Diffstat (limited to 'deps/npm/node_modules/node-gyp/src/win_delay_load_hook.cc')
-rw-r--r-- | deps/npm/node_modules/node-gyp/src/win_delay_load_hook.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/deps/npm/node_modules/node-gyp/src/win_delay_load_hook.cc b/deps/npm/node_modules/node-gyp/src/win_delay_load_hook.cc index e75954b605..5e7f14b2b2 100644 --- a/deps/npm/node_modules/node-gyp/src/win_delay_load_hook.cc +++ b/deps/npm/node_modules/node-gyp/src/win_delay_load_hook.cc @@ -1,10 +1,10 @@ /* * When this file is linked to a DLL, it sets up a delay-load hook that - * intervenes when the DLL is trying to load 'node.exe' or 'iojs.exe' - * dynamically. Instead of trying to locate the .exe file it'll just return - * a handle to the process image. + * intervenes when the DLL is trying to load the host executable + * dynamically. Instead of trying to locate the .exe file it'll just + * return a handle to the process image. * - * This allows compiled addons to work when node.exe or iojs.exe is renamed. + * This allows compiled addons to work when the host executable is renamed. */ #ifdef _MSC_VER @@ -23,8 +23,7 @@ static FARPROC WINAPI load_exe_hook(unsigned int event, DelayLoadInfo* info) { if (event != dliNotePreLoadLibrary) return NULL; - if (_stricmp(info->szDll, "iojs.exe") != 0 && - _stricmp(info->szDll, "node.exe") != 0) + if (_stricmp(info->szDll, HOST_BINARY) != 0) return NULL; m = GetModuleHandle(NULL); |