From d6d177fec5da516d00f53fd97ab6d30f1f2acd80 Mon Sep 17 00:00:00 2001 From: Jan Margeta Date: Sat, 2 Mar 2013 15:39:20 +0100 Subject: [PATCH 1/2] Fixing MSVC build by adding appropriate typedefs for uint16_t --- skimage/_shared/vectorized_ops.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/skimage/_shared/vectorized_ops.h b/skimage/_shared/vectorized_ops.h index e426c86e..29026490 100644 --- a/skimage/_shared/vectorized_ops.h +++ b/skimage/_shared/vectorized_ops.h @@ -12,6 +12,11 @@ #include #elif defined(_MSC_VER) #define inline __inline +#if (_MSC_VER < 1300) +typedef unsigned short uint16_t; +#else +typedef unsigned __int16 uint16_t; +#endif #endif /** From 3869d1ef8a10f31ba0c345f80cc76bec5e8b3bb8 Mon Sep 17 00:00:00 2001 From: Jan Margeta Date: Sun, 3 Mar 2013 22:45:03 +0100 Subject: [PATCH 2/2] Removing unnecessary typedefs for uint16_t in MSVC build --- skimage/_shared/vectorized_ops.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/skimage/_shared/vectorized_ops.h b/skimage/_shared/vectorized_ops.h index 29026490..ab9647ea 100644 --- a/skimage/_shared/vectorized_ops.h +++ b/skimage/_shared/vectorized_ops.h @@ -12,12 +12,8 @@ #include #elif defined(_MSC_VER) #define inline __inline -#if (_MSC_VER < 1300) -typedef unsigned short uint16_t; -#else typedef unsigned __int16 uint16_t; #endif -#endif /** * Add 16 unsigned 16-bit integers using SSE2, MMX or Altivec, if