X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmopenjpeg%2Flibopenjpeg%2Fevent.c;h=57e1e3b6c1e8725abc5550083a2168f62041401c;hb=df5a9566b70f78134a66ce582efe40d07b30ba3c;hp=bd0c06e2152cf562a78ebda9a1a645b8f9af39ed;hpb=62ba44019992fac89cad65f7756f8ad13972c23c;p=gdcm.git diff --git a/src/gdcmopenjpeg/libopenjpeg/event.c b/src/gdcmopenjpeg/libopenjpeg/event.c index bd0c06e2..57e1e3b6 100644 --- a/src/gdcmopenjpeg/libopenjpeg/event.c +++ b/src/gdcmopenjpeg/libopenjpeg/event.c @@ -30,7 +30,7 @@ Utility functions ==========================================================*/ -#ifndef WIN32 +#if !defined(_MSC_VER) && !defined(__MINGW32__) static char* i2a(unsigned i, char *a, unsigned r) { if (i/r > 0) a = i2a(i/r,a,r); @@ -61,7 +61,7 @@ _itoa(int i, char *a, int r) { /* ----------------------------------------------------------------------- */ -opj_event_mgr_t* opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context) { +opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context) { if(cinfo) { opj_event_mgr_t *previous = cinfo->event_mgr; cinfo->event_mgr = event_mgr;