diff options
| author | Nathan Rajlich <nathan@tootallnate.net> | 2012-10-13 16:16:56 -0700 |
|---|---|---|
| committer | Nathan Rajlich <nathan@tootallnate.net> | 2012-10-13 16:16:56 -0700 |
| commit | 4b238b4c2ae8f5cf409cea5ca214b480b00e1a86 (patch) | |
| tree | 0c403c3a2f0f117bfe7230fc7bfbd197ebf78845 /deps/uv/test/runner-win.c | |
| parent | 47643d2ec517ceb8f7ce180142262e393c4d8e89 (diff) | |
| parent | 4a23add90f155e6761d443d1277a31c2a2a4abb2 (diff) | |
| download | android-node-v8-4b238b4c2ae8f5cf409cea5ca214b480b00e1a86.tar.gz android-node-v8-4b238b4c2ae8f5cf409cea5ca214b480b00e1a86.tar.bz2 android-node-v8-4b238b4c2ae8f5cf409cea5ca214b480b00e1a86.zip | |
Merge remote-tracking branch 'origin/v0.8'
Conflicts:
AUTHORS
ChangeLog
deps/uv/test/runner-win.c
doc/api/process.markdown
lib/repl.js
src/node_crypto.cc
src/node_version.h
Diffstat (limited to 'deps/uv/test/runner-win.c')
| -rw-r--r-- | deps/uv/test/runner-win.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/deps/uv/test/runner-win.c b/deps/uv/test/runner-win.c index 8f534bcdb7..791b0ce4f6 100644 --- a/deps/uv/test/runner-win.c +++ b/deps/uv/test/runner-win.c @@ -24,8 +24,9 @@ #include <malloc.h> #include <stdio.h> #include <process.h> +#include <windows.h> #if !defined(__MINGW32__) -# include <crtdbg.h> +#include <crtdbg.h> #endif |