win: work around __pfnDliNotifyHook2 type change

orangemocha · web-flow · commit f31482e2260e · 2016-06-13T15:55:30.000+02:00
Visual Studio 2015 Update 3 defines __pfnDliNotifyHook2 as const. The decltype specifier makes the declaration work across all supported versions of VS. It also requires that the source be compiled as C++. Fixes: #949 PR-URL: #952 Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
diff --git a/addon.gypi b/addon.gypi
@@ -43,7 +43,7 @@
         'conditions': [
           [ 'OS=="win"', {
             'sources': [
-              '<(node_gyp_dir)/src/win_delay_load_hook.c',
+              '<(node_gyp_dir)/src/win_delay_load_hook.cc',
             ],
             'msvs_settings': {
               'VCLinkerTool': {
diff --git a/src/win_delay_load_hook.cc b/src/win_delay_load_hook.cc
@@ -31,6 +31,6 @@ static FARPROC WINAPI load_exe_hook(unsigned int event, DelayLoadInfo* info) {
   return (FARPROC) m;
 }
 
-PfnDliHook __pfnDliNotifyHook2 = load_exe_hook;
+decltype(__pfnDliNotifyHook2) __pfnDliNotifyHook2 = load_exe_hook;
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,6 @@ static FARPROC WINAPI load_exe_hook(unsigned int event, DelayLoadInfo* info) {`
`31`	`31`	`return (FARPROC) m;`
`32`	`32`	`}`
`33`	`33`
`34`		`-PfnDliHook __pfnDliNotifyHook2 = load_exe_hook;`
	`34`	`+decltype(__pfnDliNotifyHook2) __pfnDliNotifyHook2 = load_exe_hook;`
`35`	`35`
`36`	`36`	`#endif`