use fallback encoding in wxConvAuto when input is not in UTF-8

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

diff --git a/src/png/png.h b/src/png/png.h
index d25e6fb1531ed6aaec3c63cbb353e3a92b2ba82d..b57acb41419dc27b2ac616cbf680113268c7babe 100644 (file)
--- a/src/png/png.h
+++ b/src/png/png.h
@@ -2726,9 +2726,12 @@ PNG_EXTERN png_int_32 png_get_int_32 PNGARG((png_bytep buf));
 PNG_EXTERN png_uint_32 png_get_uint_32 PNGARG((png_bytep buf));
 PNG_EXTERN png_uint_16 png_get_uint_16 PNGARG((png_bytep buf));
 #endif /* !PNG_READ_BIG_ENDIAN_SUPPORTED */
+/* RN: This define is blatent hack to get png to (hopefully) 
+   link on OSX 10.2 and earlier versions of 10.3 due to an 
+   Apple linking bug introduced in 10.2 */
+#define png_get_uint_31 wxpng_get_uint_31
 PNG_EXTERN png_uint_32 png_get_uint_31 PNGARG((png_structp png_ptr,
   png_bytep buf));
-
 /* Initialize png_ptr struct for reading, and allocate any other memory.
  * (old interface - DEPRECATED - use png_create_read_struct instead).
  */