From 1da4252fd88b7eada5b4ed0ec9f5c91219a5ba49 Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Fri, 26 Oct 2012 14:23:09 -0700 Subject: [PATCH] Fixed mingw build. --- include/bx/float4_ni.h | 4 ++-- include/bx/foreach.h | 10 +++++----- include/compat/mingw/sal.h | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/bx/float4_ni.h b/include/bx/float4_ni.h index 08e4c55..7d998de 100644 --- a/include/bx/float4_ni.h +++ b/include/bx/float4_ni.h @@ -407,7 +407,7 @@ namespace bx const float4_t tmp0 = float4_ftoi(_a); const float4_t tmp1 = float4_itof(tmp0); const float4_t mask = float4_cmplt(tmp1, _a); - const float4_t one = float4_one(); + const float4_t one = float4_splat(1.0f); const float4_t tmp2 = float4_and(one, mask); const float4_t result = float4_add(tmp1, tmp2); @@ -419,7 +419,7 @@ namespace bx const float4_t tmp0 = float4_ftoi(_a); const float4_t tmp1 = float4_itof(tmp0); const float4_t mask = float4_cmpgt(tmp1, _a); - const float4_t one = float4_one(); + const float4_t one = float4_splat(1.0f); const float4_t tmp2 = float4_and(one, mask); const float4_t result = float4_sub(tmp1, tmp2); diff --git a/include/bx/foreach.h b/include/bx/foreach.h index f30315b..ce9beb7 100644 --- a/include/bx/foreach.h +++ b/include/bx/foreach.h @@ -60,11 +60,11 @@ namespace bx #define foreach(_variable, _container) \ for (const bx::foreach_ns::ContainerBase &__temp_container__ = bx::foreach_ns::containerNew(_container); \ - bx::foreach_ns::container(&__temp_container__, true ? 0 : bx::foreach_ns::pointer(_container))->condition(); \ - ++bx::foreach_ns::container(&__temp_container__, true ? 0 : bx::foreach_ns::pointer(_container))->m_it) \ - for (_variable = *container(&__temp_container__, true ? 0 : bx::foreach_ns::pointer(_container))->m_it; \ - bx::foreach_ns::container(&__temp_container__, true ? 0 : bx::foreach_ns::pointer(_container))->m_break; \ - --bx::foreach_ns::container(&__temp_container__, true ? 0 : bx::foreach_ns::pointer(_container))->m_break) + bx::foreach_ns::container(&__temp_container__, true ? 0 : bx::foreach_ns::pointer(_container) )->condition(); \ + ++bx::foreach_ns::container(&__temp_container__, true ? 0 : bx::foreach_ns::pointer(_container) )->m_it) \ + for (_variable = *container(&__temp_container__, true ? 0 : bx::foreach_ns::pointer(_container) )->m_it; \ + bx::foreach_ns::container(&__temp_container__, true ? 0 : bx::foreach_ns::pointer(_container) )->m_break; \ + --bx::foreach_ns::container(&__temp_container__, true ? 0 : bx::foreach_ns::pointer(_container) )->m_break) } // namespace bx diff --git a/include/compat/mingw/sal.h b/include/compat/mingw/sal.h index ab23504..26e4aec 100644 --- a/include/compat/mingw/sal.h +++ b/include/compat/mingw/sal.h @@ -49,6 +49,7 @@ #define __in_nz #define __in_ecount_nz(size) #define __in_bcount_nz(size) +#define __in_xcount_opt(size) #define __out #define __out_ecount(size) #define __out_bcount(size)