diff --git a/Utilities/otbopenjpeg/libopenjpeg/openjpeg.h b/Utilities/otbopenjpeg/libopenjpeg/openjpeg.h
index fa314765b28089441e363acf85575e92d4f9e54c..04691848adfb1362ef4b9e5338dfabf0c61767d2 100755
--- a/Utilities/otbopenjpeg/libopenjpeg/openjpeg.h
+++ b/Utilities/otbopenjpeg/libopenjpeg/openjpeg.h
@@ -33,23 +33,16 @@
 
 #ifndef OPENJPEG_H
 #define OPENJPEG_H
-
 #if defined(OPJ_STATIC) || !(defined(WIN32) || defined(__WIN32__))
-//#if (defined(WIN32) || defined(WIN32CE)) && !defined(__CYGWIN__) && !defined(__MINGW32__)
 	#define OPJ_API
 	#define OPJ_CALLCONV
 #else
-    #if !defined(__CYGWIN__) && !defined(__MINGW32__)
-        #define OPJ_CALLCONV __stdcall
-        #ifdef OPJ_EXPORTS
-            #define OPJ_API __declspec(dllexport)
-        #else
-            #define OPJ_API __declspec(dllimport)
-        #endif /* OPJ_EXPORTS */
-     #else
-        #define OPJ_API
-        #define OPJ_CALLCONV
-     #endif /*!defined(__CYGWIN__) && !defined(__MINGW32__)   */
+	#define OPJ_CALLCONV 
+	#ifdef OPJ_EXPORTS
+		#define OPJ_API __declspec(dllexport)
+	#else
+		#define OPJ_API __declspec(dllimport)
+	#endif /* OPJ_EXPORTS */
 #endif /* !OPJ_STATIC || !WIN32 */
 
 #ifndef __cplusplus