From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 11 Apr 2006 21:47:51 +0000 (+0000)
Subject: MacOSX g++ setjmp fix from div0
X-Git-Tag: xonotic-v0.1.0preview~4097
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d0930eceaee884fa9e85fa20f080126c8925c728;p=xonotic%2Fdarkplaces.git

MacOSX g++ setjmp fix from div0


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6266 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/image_png.c b/image_png.c
index 94a2bd81..a5a23ad5 100644
--- a/image_png.c
+++ b/image_png.c
@@ -250,7 +250,11 @@ unsigned char *PNG_LoadImage (const unsigned char *raw, int filesize, int matchw
 	// NOTE: this relies on jmp_buf being the first thing in the png structure
 	// created by libpng! (this is correct for libpng 1.2.x)
 #ifdef __cplusplus
+#ifdef MACOSX
+	if (setjmp((int *)png))
+#else
 	if (setjmp((__jmp_buf_tag *)png))
+#endif
 #else
 	if (setjmp(png))
 #endif