fix_macosx.patch 946 B

1234567891011121314151617181920212223242526
  1. diff --git a/lzhamdecomp/lzham_platform.cpp b/lzhamdecomp/lzham_platform.cpp
  2. index cfc85c1..2cf493c 100644
  3. --- a/lzhamdecomp/lzham_platform.cpp
  4. +++ b/lzhamdecomp/lzham_platform.cpp
  5. @@ -62,7 +62,7 @@ void lzham_debug_break(void)
  6. #if LZHAM_USE_WIN32_API
  7. DebugBreak();
  8. #elif (TARGET_OS_MAC == 1) && (TARGET_IPHONE_SIMULATOR == 0) && (TARGET_OS_IPHONE == 0)
  9. - __asm {int 3}
  10. + __asm__("int $3");
  11. #else
  12. assert(0);
  13. #endif
  14. diff --git a/lzhamdecomp/lzham_traits.h b/lzhamdecomp/lzham_traits.h
  15. index ea7214f..1ec89ae 100644
  16. --- a/lzhamdecomp/lzham_traits.h
  17. +++ b/lzhamdecomp/lzham_traits.h
  18. @@ -68,7 +68,7 @@ namespace lzham
  19. #define LZHAM_DEFINE_BITWISE_COPYABLE(Q) template<> struct bitwise_copyable<Q> { enum { cFlag = true }; };
  20. #if defined(__APPLE__) || defined(__NetBSD__)
  21. - #define LZHAM_IS_POD(T) std::__is_pod<T>::__value
  22. + #define LZHAM_IS_POD(T) std::is_pod<T>::value
  23. #else
  24. #define LZHAM_IS_POD(T) __is_pod(T)
  25. #endif