ENH: Update CMake to do proper installation. Still using the 2.2 installation approac...

[openjpeg.git] / libopenjpeg / event.c

diff --git a/libopenjpeg/event.c b/libopenjpeg/event.c
index 248ef6e3f1b105e797bbf304bc21563b5fb168cd..183931d15e5a7d714f48722559e8c831d8f67585 100644 (file)
--- a/libopenjpeg/event.c
+++ b/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;