mingw.patch 1.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152
  1. diff --git a/common/include/wmspecstrings_adt.h b/common/include/wmspecstrings_adt.h
  2. index ca7f25f..d5eb028 100644
  3. --- a/common/include/wmspecstrings_adt.h
  4. +++ b/common/include/wmspecstrings_adt.h
  5. @@ -36,6 +36,10 @@
  6. __type_has_adt_prop(compname,valid_schars) \
  7. __type_has_adt_prop(compname,correct_len) \
  8. __nullterminated
  9. +#ifdef __MINGW32__
  10. +#undef __$compname_props
  11. +#define __$compname_props
  12. +#endif
  13. #if defined(UNICODE) || defined(_UNICODE)
  14. #define __$TCHAR unsigned short
  15. #else
  16. diff --git a/image/sys/strcodec.h b/image/sys/strcodec.h
  17. index 695a454..9fad5b6 100644
  18. --- a/image/sys/strcodec.h
  19. +++ b/image/sys/strcodec.h
  20. @@ -59,7 +59,7 @@
  21. //#ifdef WIN32
  22. #if defined(WIN32) && !defined(UNDER_CE) // WIN32 seems to be defined always in VS2005 for ARM platform
  23. #define PLATFORM_X86
  24. -#include "..\x86\x86.h"
  25. +#include "../x86/x86.h"
  26. #endif
  27. #ifndef UNREFERENCED_PARAMETER
  28. diff --git a/jxrgluelib/JXRMeta.h b/jxrgluelib/JXRMeta.h
  29. index b7b5880..7c9d653 100644
  30. --- a/jxrgluelib/JXRMeta.h
  31. +++ b/jxrgluelib/JXRMeta.h
  32. @@ -111,6 +111,18 @@
  33. #define __out_win __out
  34. #endif
  35. +#ifndef __in
  36. +#define __in
  37. +#endif
  38. +#ifndef __out
  39. +#define __out
  40. +#endif
  41. +#ifndef __in_ecount
  42. +#define __in_ecount(x)
  43. +#endif
  44. +#ifndef __out_ecount
  45. +#define __out_ecount(x)
  46. +#endif
  47. //================================================================