summaryrefslogtreecommitdiff
path: root/deps/npm/node_modules/node-gyp/src
diff options
context:
space:
mode:
authorRebecca Turner <me@re-becca.org>2016-01-28 18:11:35 -0800
committerJeremiah Senkpiel <fishrock123@rocketmail.com>2016-02-01 10:43:34 -0500
commit76cb81b354de8447898427619c66c86c59b22b3d (patch)
tree0c0826bed77086fb38cda8dc680d4fb10d2cff25 /deps/npm/node_modules/node-gyp/src
parentd5d301f3032a0723f5a29cfbe0d95ac4ad205d42 (diff)
downloadnode-new-76cb81b354de8447898427619c66c86c59b22b3d.tar.gz
deps: upgrade npm to 3.6.0
PR-URL: https://github.com/nodejs/node/pull/4958 Reviewed-By: Myles Borins <mborins@us.ibm.com> Reviewed-By: Kat Marchán <kzm@sykosomatic.org> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'deps/npm/node_modules/node-gyp/src')
-rw-r--r--deps/npm/node_modules/node-gyp/src/win_delay_load_hook.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/deps/npm/node_modules/node-gyp/src/win_delay_load_hook.c b/deps/npm/node_modules/node-gyp/src/win_delay_load_hook.c
index f397cfa195..b1e170aa13 100644
--- a/deps/npm/node_modules/node-gyp/src/win_delay_load_hook.c
+++ b/deps/npm/node_modules/node-gyp/src/win_delay_load_hook.c
@@ -9,7 +9,10 @@
#ifdef _MSC_VER
+#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
+#endif
+
#include <windows.h>
#include <delayimp.h>