Zsh Mailing List Archive Messages sorted by: Reverse Date, Date, Thread, Author

4.3.4 HEAD and iconv

X-seq: zsh-workers 23326
From: Phil Pennock <zsh-workers+phil.pennock@xxxxxxxxxxxx>
To: zsh-workers@xxxxxxxxxx
Subject: 4.3.4 HEAD and iconv
Date: Wed, 25 Apr 2007 18:17:02 -0700
Domainkey-signature: a=rsa-sha1; q=dns; c=nofws; s=first1; d=spodhuis.org; h=Received:Date:From:To:Subject:Message-ID:Mail-Followup-To:MIME-Version:Content-Type:Content-Disposition; b=Hl6eX5Ll8PRgFo1m3+55NT8jUAYgxypHa4kCY9PHSVbQ3hchghlGqMxlSai6/YRnpKxs+F9ZWGM4u9XZ0oR5wMwI4au4LmMmZqi7vhQW2QT+CU31EFkzFbZDs7R3Irx7TU36/josPSQs08iZGlaWafiAXvtAFHkpK6Ne1oBCshw=;
Mail-followup-to: zsh-workers@xxxxxxxxxx
Mailing-list: contact zsh-workers-help@xxxxxxxxxx; run by ezmlm

Hi,

If I get the current HEAD source then it won't build for me by default,
as I didn't let it know where iconv was and there's a point in the code
which assumes that if you HAVE_NL_LANGINFO and CODESET then you can use
a variable, count, which only exists if you HAVE_ICONV.

No idea whether or not this is a logically correct fix, but it does let
the code compile and run.

--- zsh-head/Src/utils.c        Tue Apr 17 04:59:38 2007
+++ zsh/Src/utils.c     Wed Apr 25 17:35:12 2007
@@ -4569,10 +4569,12 @@
     int count;
 #else
     unsigned int wval;
-# if defined(HAVE_NL_LANGINFO) && defined(CODESET) && defined(HAVE_ICONV)
+# if defined(HAVE_NL_LANGINFO) && defined(CODESET)
+#  if defined(HAVE_ICONV)
     iconv_t cd;
     char inbuf[4];
     size_t inbytes, outbytes;
+#  endif
     size_t count;
 # endif
 #endif

Follow-Ups:
- Re: 4.3.4 HEAD and iconv
  - From: Peter Stephenson

Messages sorted by: Reverse Date, Date, Thread, Author