Re: [PATCH] Makefile: iconv() on Darwin has the old interface

Previous thread: [PATCH] t5300-pack-object.sh: portability issue using /usr/bin/stat by Arjen Laarhoven on Friday, April 6, 2007 - 4:49 pm. (6 messages)

Next thread: Re: [PATCH] rename_ref(): only print a warning when config-file update fails by Junio C Hamano on Friday, April 6, 2007 - 5:14 pm. (1 message)
From: Arjen Laarhoven
Date: Friday, April 6, 2007 - 4:49 pm

The libiconv on Darwin uses the old iconv() interface (2nd argument is a
const char **, instead of a char **).  Add OLD_ICONV to the Darwin
variable definitions to handle this.

Signed-off-by: Arjen Laarhoven <arjen@yaph.org>
---
 Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index ad321b3..2146403 100644
--- a/Makefile
+++ b/Makefile
@@ -385,6 +385,7 @@ endif
 ifeq ($(uname_S),Darwin)
 	NEEDS_SSL_WITH_CRYPTO = YesPlease
 	NEEDS_LIBICONV = YesPlease
+	OLD_ICONV = UnfortunatelyYes
 	NO_STRLCPY = YesPlease
 endif
 ifeq ($(uname_S),SunOS)
-- 
1.5.1.rc3.29.gd8b6
-

From: Junio C Hamano
Date: Friday, April 6, 2007 - 5:31 pm

This patch either goes to 'maint' if everybody on Darwin needs
to say OLD_ICONV, or not applied at all as-is if it is dependent
on which variant of Darwin you are talking about.

Anybody else on Darwin around?


-

From: Brian Gernhardt
Date: Friday, April 6, 2007 - 7:51 pm

Applying the patch does silence an incompatible pointer warning I  
hadn't noticed previously on OS 10.4.9.  The man page also agrees  
that iconv() uses const char **.  So ACK from me.

~~ Brian


-

Previous thread: [PATCH] t5300-pack-object.sh: portability issue using /usr/bin/stat by Arjen Laarhoven on Friday, April 6, 2007 - 4:49 pm. (6 messages)

Next thread: Re: [PATCH] rename_ref(): only print a warning when config-file update fails by Junio C Hamano on Friday, April 6, 2007 - 5:14 pm. (1 message)