summaryrefslogtreecommitdiffstats
path: root/native_client_sdk/src
diff options
context:
space:
mode:
authornoelallen@chromium.org <noelallen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-23 21:58:26 +0000
committernoelallen@chromium.org <noelallen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-23 21:58:26 +0000
commit365598d45b510515670ad8fd9cfbd49d5645f1d1 (patch)
treed4fc9625e1f64ed42d8e651d1fa6db36031ea989 /native_client_sdk/src
parent22310935864e7e05a31cfb021839b0699d24a9e3 (diff)
downloadchromium_src-365598d45b510515670ad8fd9cfbd49d5645f1d1.zip
chromium_src-365598d45b510515670ad8fd9cfbd49d5645f1d1.tar.gz
chromium_src-365598d45b510515670ad8fd9cfbd49d5645f1d1.tar.bz2
Include windows.h
Fix windows bot by including windows.h TBR=sbc@chromium.org Review URL: https://codereview.chromium.org/19668005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213242 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk/src')
-rw-r--r--native_client_sdk/src/libraries/nacl_io/kernel_wrap_win.cc4
-rw-r--r--native_client_sdk/src/libraries/nacl_io/library.dsc2
2 files changed, 4 insertions, 2 deletions
diff --git a/native_client_sdk/src/libraries/nacl_io/kernel_wrap_win.cc b/native_client_sdk/src/libraries/nacl_io/kernel_wrap_win.cc
index d991785..77b8b60 100644
--- a/native_client_sdk/src/libraries/nacl_io/kernel_wrap_win.cc
+++ b/native_client_sdk/src/libraries/nacl_io/kernel_wrap_win.cc
@@ -15,6 +15,8 @@
#include <sys/stat.h>
#include "nacl_io/kernel_intercept.h"
+#include <windows.h>
+
namespace {
template <typename SrcStat, typename DstStat>
@@ -317,7 +319,7 @@ uint64_t usec_since_epoch() {
ularge.HighPart = ft.dwHighDateTime;
// Truncate to usec resolution.
- return usecs = ularge.QuadPart / 10;
+ return ularge.QuadPart / 10;
}
// Do nothing for Windows, we replace the library at link time.
diff --git a/native_client_sdk/src/libraries/nacl_io/library.dsc b/native_client_sdk/src/libraries/nacl_io/library.dsc
index 6d65846..217a93d 100644
--- a/native_client_sdk/src/libraries/nacl_io/library.dsc
+++ b/native_client_sdk/src/libraries/nacl_io/library.dsc
@@ -1,5 +1,5 @@
{
- 'TOOLS': ['newlib', 'glibc', 'pnacl'],
+ 'TOOLS': ['newlib', 'glibc', 'pnacl', 'win'],
'SEARCH': [
'.',
'pepper'