Merge changes, also fix Windows build (missing header)

2014-02-27 15:58:15 -06:00 · 2014-02-27 15:58:15 -06:00 · 72eb366997
parent dd268d43d9
commit 72eb366997
2 changed files with 5 additions and 1 deletions
--- a/library/Process-windows.cpp
+++ b/library/Process-windows.cpp
@ -24,8 +24,12 @@ distribution.

 #include "Internal.h"

+#define _WIN32_WINNT 0x0501
+#define WINVER 0x0501
+
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#include <psapi.h>

 #include <cstring>
 #include <cstdio>
--- a/library/xml
+++ b/library/xml
@ -1 +1 @@
-Subproject commit d0429498124d9887df46cf0a6e609232ab499224
+Subproject commit 663f9e124e2f3ac59d6761ad6d29af79f5e3c7da