msvc.patch 1.0 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. diff --git a/include/UtilFoundation.h b/include/UtilFoundation.h
  2. index 2eb6290..a449b5b 100644
  3. --- a/include/UtilFoundation.h
  4. +++ b/include/UtilFoundation.h
  5. @@ -70,3 +70,3 @@
  6. -#include <half.h>
  7. +#include <OpenEXR/half.h>
  8. @@ -90,6 +90,9 @@
  9. #ifndef WIN32_LEAN_AND_MEAN
  10. #define WIN32_LEAN_AND_MEAN
  11. #endif
  12. +#ifndef NOMINMAX
  13. +#define NOMINMAX
  14. +#endif
  15. // needed for mutex stuff
  16. #include <Windows.h>
  17. diff --git a/src/FieldMapping.cpp b/src/FieldMapping.cpp
  18. index b1f1a1f..90612b1 100644
  19. --- a/src/FieldMapping.cpp
  20. +++ b/src/FieldMapping.cpp
  21. @@ -49,9 +49,6 @@
  22. #include "FieldMapping.h"
  23. #include "Types.h"
  24. -#ifdef WIN32
  25. -#define isnan(__x__) _isnan(__x__)
  26. -#endif
  27. //----------------------------------------------------------------------------//
  28. diff --git a/src/Log.cpp b/src/Log.cpp
  29. index f78229c..d095a50 100644
  30. --- a/src/Log.cpp
  31. +++ b/src/Log.cpp
  32. @@ -40,7 +40,8 @@
  33. */
  34. //----------------------------------------------------------------------------//
  35. -
  36. +#ifndef _WIN32
  37. #include <unistd.h>
  38. +#endif
  39. #include <ios>
  40. #include <fstream>