summaryrefslogtreecommitdiff
path: root/src/pugixml.cpp
diff options
context:
space:
mode:
authorarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2010-05-25 17:27:29 +0000
committerarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2010-05-25 17:27:29 +0000
commitc88b4ca2c2e0a5c7a0bb4ae6a09681a415f93333 (patch)
treeabc6da2bf54e7e92a900b201110f3f32b4806279 /src/pugixml.cpp
parent6e2521830f255c6b35ac302363a241274a336c1c (diff)
Internal charN_t types now use fixed size uintN_t types
git-svn-id: http://pugixml.googlecode.com/svn/trunk@448 99668b35-9821-0410-8761-19e4c4f06640
Diffstat (limited to 'src/pugixml.cpp')
-rw-r--r--src/pugixml.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/pugixml.cpp b/src/pugixml.cpp
index bf5253f..3f3984d 100644
--- a/src/pugixml.cpp
+++ b/src/pugixml.cpp
@@ -49,11 +49,16 @@ using std::memcpy;
#endif
// uintptr_t
-#if !defined(_MSC_VER)
+#if !defined(_MSC_VER) || _MSC_VER >= 1600
# include <stdint.h>
-#elif _MSC_VER < 1300
+#else
+# if _MSC_VER < 1300
// No native uintptr_t in MSVC6
typedef size_t uintptr_t;
+# endif
+typedef unsigned __int8 uint8_t;
+typedef unsigned __int16 uint16_t;
+typedef unsigned __int32 uint32_t;
#endif
// Inlining controls
@@ -609,9 +614,9 @@ namespace pugi
{
namespace impl
{
- typedef unsigned char char8_t;
- typedef unsigned short char16_t;
- typedef unsigned int char32_t;
+ typedef uint8_t char8_t;
+ typedef uint16_t char16_t;
+ typedef uint32_t char32_t;
inline char16_t endian_swap(char16_t value)
{