Source cleaning: whitespaces, tabs, -1/wxNOT_FOUND, TRUE/true, FALSE/false.

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

diff --git a/src/png/pngconf.h b/src/png/pngconf.h
index 738a43a44c0b1345564d7f0eea139c613fc2bfd3..723141ab2c3a66f0997d1fa4a63c1345043ce7e4 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) || \
-      defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)
+      defined(THINK_C) || (defined(__SC__) && !defined(__DMC__))|| defined(TARGET_OS_MAC)
 #    define MACOS
 #  endif
 #endif
@@ -1157,9 +1157,13 @@ typedef z_stream FAR *  png_zstreamp;
 #  endif
 #endif
 
-#if defined(__CYGWIN__)
+#if defined(__CYGWIN__) || defined(__WINE__)
 #  undef PNGAPI
-#  define PNGAPI __cdecl
+#  if defined(__WINE__)
+#    define PNGAPI
+#  else
+#    define PNGAPI __cdecl
+#  endif
 #  undef PNG_IMPEXP
 #  define PNG_IMPEXP
 #endif
@@ -1242,7 +1246,7 @@ typedef z_stream FAR *  png_zstreamp;
 #endif
 
 #if defined(__VISAGECPP__)
-/* I don't compile with this _System linkage for wxWindows */
+/* I don't compile with this _System linkage for wxWidgets */
 #  ifdef PNGAPI
 #    undef PNGAPI
 #  endif