rtti api mods added

[wxWidgets.git] / src / png / pngconf.h

diff --git a/src/png/pngconf.h b/src/png/pngconf.h
index 738a43a44c0b1345564d7f0eea139c613fc2bfd3..7b60f45b5bd1626688149b9206ea569541c30165 100644 (file)
--- a/src/png/pngconf.h
+++ b/src/png/pngconf.h
@@ -227,7 +227,7 @@
  */
 #ifndef MACOS
 #  if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
  */
 #ifndef MACOS
 #  if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \

-      defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)
+      defined(THINK_C) || (defined(__SC__) && !defined(__DMC__))|| defined(TARGET_OS_MAC)

 #    define MACOS
 #  endif
 #endif
 #    define MACOS
 #  endif
 #endif


@@ -1157,9 +1157,13 @@ typedef z_stream FAR *  png_zstreamp;
 #  endif
 #endif
 
 #  endif
 #endif
 

-#if defined(__CYGWIN__)
+#if defined(__CYGWIN__) || defined(__WINE__)

 #  undef PNGAPI
 #  undef PNGAPI

-#  define PNGAPI __cdecl
+#  if defined(__WINE__)
+#    define PNGAPI
+#  else
+#    define PNGAPI __cdecl
+#  endif

 #  undef PNG_IMPEXP
 #  define PNG_IMPEXP
 #endif
 #  undef PNG_IMPEXP
 #  define PNG_IMPEXP
 #endif