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

diff --git a/include/polarssl/bignum.h b/include/polarssl/bignum.h
index e2d9347..3b8b1f6 100644
--- a/include/polarssl/bignum.h
+++ b/include/polarssl/bignum.h
@@ -34,8 +34,13 @@
 
 #ifdef _MSC_VER
 #include <basetsd.h>
+#if (_MSC_VER <= 1200)
+typedef   signed short  int16_t;
+typedef unsigned short uint16_t;
+#else
 typedef  INT16  int16_t;
 typedef UINT16 uint16_t;
+#endif
 typedef  INT32  int32_t;
 typedef UINT32 uint32_t;
 typedef UINT64 uint64_t;