VS2008

Author: tstenner

include/lsl_c.h

@@ -4,15 +4,12 @@
 #if defined(LIBLSL_FFI)
 // Skip any typedefs that might confuse a FFI header parser, e.g. cffi
 #elif defined(_MSC_VER) && _MSC_VER < 1600
-#if !defined(__STDC_CONSTANT_MACROS) && !defined(BOOST_CSTDINT_HPP)
 typedef signed char int8_t;
 typedef signed short int16_t;
-typedef unsigned short uint16_t;
 typedef signed int int32_t;
 typedef signed long long int64_t;
 typedef unsigned int uint32_t;
 typedef unsigned long long uint64_t;
-#endif
 #else
 #include <stdint.h>
 #endif

src/common.h

@@ -21,7 +21,9 @@ using lslboost::int32_t;
 using lslboost::int64_t;
 using lslboost::uint8_t;
 using lslboost::uint16_t;
+#ifndef LSL_C_H
 using lslboost::uint32_t;
+#endif
 using lslboost::uint64_t;
 #define __func__ "An unknown function"
 #endif