Skip to content
Snippets Groups Projects
Commit bf901c91 authored by Julien Michel's avatar Julien Michel
Browse files

erreur compilation windows

parent 26bdac10
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Utilities/otbopenjpeg/libopenjpeg/openjpeg.h
+ 6
− 13
View file @ bf901c91
...@@ -33,23 +33,16 @@ ...@@ -33,23 +33,16 @@
#ifndef OPENJPEG_H #ifndef OPENJPEG_H
#define OPENJPEG_H #define OPENJPEG_H
#if defined(OPJ_STATIC) || !(defined(WIN32) || defined(__WIN32__)) #if defined(OPJ_STATIC) || !(defined(WIN32) || defined(__WIN32__))
//#if (defined(WIN32) || defined(WIN32CE)) && !defined(__CYGWIN__) && !defined(__MINGW32__)
#define OPJ_API #define OPJ_API
#define OPJ_CALLCONV #define OPJ_CALLCONV
#else #else
#if !defined(__CYGWIN__) && !defined(__MINGW32__) #define OPJ_CALLCONV
#define OPJ_CALLCONV __stdcall #ifdef OPJ_EXPORTS
#ifdef OPJ_EXPORTS #define OPJ_API __declspec(dllexport)
#define OPJ_API __declspec(dllexport) #else
#else #define OPJ_API __declspec(dllimport)
#define OPJ_API __declspec(dllimport) #endif /* OPJ_EXPORTS */
#endif /* OPJ_EXPORTS */
#else
#define OPJ_API
#define OPJ_CALLCONV
#endif /*!defined(__CYGWIN__) && !defined(__MINGW32__) */
#endif /* !OPJ_STATIC || !WIN32 */ #endif /* !OPJ_STATIC || !WIN32 */
#ifndef __cplusplus #ifndef __cplusplus
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment