[trunk] Fix heap buffer overflow

[openjpeg.git] / libopenjpeg / opj_includes.h

diff --git a/libopenjpeg/opj_includes.h b/libopenjpeg/opj_includes.h
index 4801ef69d8a0a698d8929d2219cddaa37f21fe16..ebc946ac2f076da85523303a9546f13b9a56eeb0 100644 (file)
--- a/libopenjpeg/opj_includes.h
+++ b/libopenjpeg/opj_includes.h
@@ -60,7 +60,7 @@
 #endif
 
 
-#if defined(MSWINDOWS) && !defined(Windows95) && !defined(__BORLANDC__) && \
+#if defined(WIN32) && !defined(Windows95) && !defined(__BORLANDC__) && \
   !(defined(_MSC_VER) && _MSC_VER < 1400) && \
   !(defined(__MINGW32__) && __MSVCRT_VERSION__ < 0x800)
   /*
@@ -145,6 +145,7 @@ static INLINE long lrintf(float f){
 }
 #endif
 
+#include "opj_inttypes.h"
 #include "j2k_lib.h"
 #include "opj_malloc.h"
 #include "event.h"
@@ -178,7 +179,7 @@ static INLINE long lrintf(float f){
 #endif /* USE_JPWL */
 /* <<JPWL */
 
-// V2
+/* V2 */
 #include "function_list.h"
 
 #endif /* OPJ_INCLUDES_H */