From 0150ab1bb24e351a566a98c107a57b4f25265a45 Mon Sep 17 00:00:00 2001
From: michi_cc <michi_cc@openttd.org>
Date: Wed, 26 Jun 2013 21:17:09 +0000
Subject: (svn r25480) -Codechange: [OSX] OS X SDK versions >= 10.5 always have
 a non-const iconv declaration.

---
 config.lib | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config.lib')

diff --git a/config.lib b/config.lib
index f2750f060..dec0dc3a7 100644
--- a/config.lib
+++ b/config.lib
@@ -1754,7 +1754,7 @@ make_cflags_and_ldflags() {
 			fi
 		fi
 
-		if [ "$have_non_const_iconv" != "no" ]; then
+		if [ "$os" != "OSX" ] && [ "$have_non_const_iconv" != "no" ]; then
 			CFLAGS="$CFLAGS -DHAVE_NON_CONST_ICONV"
 		fi
 	fi
@@ -3488,7 +3488,7 @@ generate_src_osx() {
 				CFLAGS="-isysroot $osx_sdk_path $CFLAGS_orig"
 				LDFLAGS="-Wl,-syslibroot,$osx_sdk_path $LDFLAGS_orig"
 			fi
-			CFLAGS="$CFLAGS -D_SQ64 -DHAVE_NON_CONST_ICONV -DNO_QUICKTIME -UENABLE_COCOA_QUICKDRAW"
+			CFLAGS="$CFLAGS -D_SQ64 -DNO_QUICKTIME -UENABLE_COCOA_QUICKDRAW"
 			LIBS="`echo $LIBS | sed 's/-framework QuickTime//'`"
 		fi
 
-- 
cgit v1.2.3-54-g00ecf