aboutsummaryrefslogtreecommitdiffstats
path: root/util-src
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-05-14 09:39:32 +0100
committerMatthew Wild <mwild1@gmail.com>2013-05-14 09:39:32 +0100
commit70ccc2bbe148c6425641d0db423879a719bf3f21 (patch)
treeb86a1c45fbce3384d59838f15874809dfd441913 /util-src
parentae059bfe54a4d444e49085629392154fa3b206f1 (diff)
parentab3a99ef852a918a094b0176fa50a19a64361241 (diff)
downloadprosody-70ccc2bbe148c6425641d0db423879a719bf3f21.tar.gz
prosody-70ccc2bbe148c6425641d0db423879a719bf3f21.zip
Merge 0.9->trunk
Diffstat (limited to 'util-src')
-rw-r--r--util-src/hashes.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/util-src/hashes.c b/util-src/hashes.c
index 8f7d7140..39737ae0 100644
--- a/util-src/hashes.c
+++ b/util-src/hashes.c
@@ -15,7 +15,12 @@
#include <string.h>
#include <stdlib.h>
+
+#ifdef _MSC_VER
+typedef unsigned __int32 uint32_t;
+#else
#include <inttypes.h>
+#endif
#include "lua.h"
#include "lauxlib.h"