From bbfc8b45e000a9a4cc48b8752cd5c1adb503107b Mon Sep 17 00:00:00 2001 From: Rashad Kanavath <mohammed.rashad-km@cnes.fr> Date: Wed, 4 Jun 2014 15:49:50 +0200 Subject: [PATCH] COMP: prevent DllMain declaration conflict for MinGW --- Utilities/otbopenjpeg/libopenjpeg/openjpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/otbopenjpeg/libopenjpeg/openjpeg.c b/Utilities/otbopenjpeg/libopenjpeg/openjpeg.c index 4470887d48..1038c9b31a 100644 --- a/Utilities/otbopenjpeg/libopenjpeg/openjpeg.c +++ b/Utilities/otbopenjpeg/libopenjpeg/openjpeg.c @@ -174,7 +174,7 @@ opj_bool opj_seek_from_file (OPJ_OFF_T p_nb_bytes, FILE * p_user_data) /* ---------------------------------------------------------------------- */ #ifdef _WIN32 -#ifndef OPJ_STATIC +#if !defined(OPJ_STATIC) && !defined(__MINGW32__) BOOL APIENTRY DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { -- GitLab