4.3.4 HEAD and iconv

4.3.4 HEAD and iconv

[Phil Pennock]

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

Re: 4.3.4 HEAD and iconv

[Peter Stephenson]

Phil Pennock wrote:
> 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.

It looks OK and I've committed it.  Thanks.

-- 
Peter Stephenson <pws@csr.com>                  Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK                          Tel: +44 (0)1223 692070


To access the latest news from CSR copy this link into a web browser:  http://www.csr.com/email_sig.php

To get further information regarding CSR, please visit our Investor Relations page at http://ir.csr.com/csr/about/overview