[jit] Fix the saving of the 'cfg->ret_var_set' flag when inlining, it was set to...

[mono.git] / support / minizip / ioapi.h

diff --git a/support/minizip/ioapi.h b/support/minizip/ioapi.h
index 7d457baab34180639d97e82ffdf53d69df5cc6e2..ff8470389618d93df5307f98f5fc27cc5fb7325a 100644 (file)
--- a/support/minizip/ioapi.h
+++ b/support/minizip/ioapi.h
@@ -23,12 +23,16 @@
 
 
 #ifndef ZCALLBACK
-
-#if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
-#define ZCALLBACK CALLBACK
-#else
+// Nothing defines 'CALLBACK' anyway so to avoid accidentally changing
+// the calling convention by including a header which defines this, just
+// define ZCALLBACK as empty so we always get cdecl and our P/Invokes don't break.
 #define ZCALLBACK
-#endif
+
+//#if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
+//#define ZCALLBACK CALLBACK
+//#else
+//#define ZCALLBACK
+//#endif
 #endif
 
 #ifdef __cplusplus