- Merged fixes 1394 and 1395 from trunk to PolarSSL 1.2 branch

diff --git a/include/polarssl/gcm.h b/include/polarssl/gcm.h
index 2f88c70..77baa17 100644
--- a/include/polarssl/gcm.h
+++ b/include/polarssl/gcm.h
@@ -29,7 +29,12 @@
 
 #include "aes.h"
 
+#ifdef _MSC_VER
+#include <basetsd.h>
+typedef UINT64 uint64_t;
+#else
 #include <stdint.h>
+#endif
 
 #define GCM_ENCRYPT     1
 #define GCM_DECRYPT     0