From b2485e8a52ed831f804db574ba7f3281a2043cec Mon Sep 17 00:00:00 2001
From: athile <athile.g@gmail.com>
Date: Sun, 27 Jun 2010 14:43:07 -0700
Subject: [PATCH] Windows build fixes

---
 components/bsa/bsa_file.hpp   |  5 ++---
 components/esm/esm_reader.hpp |  2 +-
 components/misc/stringops.cpp |  2 +-
 libs/platform/stdint.h        | 10 ++++++----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/components/bsa/bsa_file.hpp b/components/bsa/bsa_file.hpp
index 0e693dfdf9..7ec101b43b 100644
--- a/components/bsa/bsa_file.hpp
+++ b/components/bsa/bsa_file.hpp
@@ -25,9 +25,8 @@
 #define _BSA_FILE_H_
 
 #include <libs/mangle/stream/stream.hpp>
-
-#include <stdint.h>
-#include <strings.h>
+#include <libs/platform/stdint.h>
+#include <libs/platform/strings.h>
 #include <string>
 #include <vector>
 #include <map>
diff --git a/components/esm/esm_reader.hpp b/components/esm/esm_reader.hpp
index d4f6f48ca7..c03f1d1624 100644
--- a/components/esm/esm_reader.hpp
+++ b/components/esm/esm_reader.hpp
@@ -2,7 +2,7 @@
 #define _ESM_READER_H
 
 #include <string>
-#include <stdint.h>
+#include <libs/platform/stdint.h>
 #include <string.h>
 #include <assert.h>
 #include <vector>
diff --git a/components/misc/stringops.cpp b/components/misc/stringops.cpp
index 1b1ee0c570..f6b63372c2 100644
--- a/components/misc/stringops.cpp
+++ b/components/misc/stringops.cpp
@@ -1,7 +1,7 @@
 #include "stringops.hpp"
 
 #include <string.h>
-#include <strings.h>
+#include <libs/platform/strings.h>
 
 bool begins(const char* str1, const char* str2)
 {
diff --git a/libs/platform/stdint.h b/libs/platform/stdint.h
index c1a430e87b..499590da78 100644
--- a/libs/platform/stdint.h
+++ b/libs/platform/stdint.h
@@ -2,10 +2,12 @@
 #ifndef _STDINT_WRAPPER_H
 #define _STDINT_WRAPPER_H
 
-typedef int int32_t;
-typedef unsigned int uint32_t;
+#include <boost/cstdint.hpp>
 
-typedef long long int64_t;
-typedef unsigned long long uint64_t;
+// Pull the boost names into the global namespace for convenience
+using boost::int32_t;
+using boost::uint32_t;
+using boost::int64_t;
+using boost::uint64_t;
 
 #endif