From: Peter Stephenson <p.w.stephenson@ntlworld.com>
To: Peter Stephenson <p.w.stephenson@ntlworld.com>
Cc: Phil Pennock <zsh-workers+phil.pennock@spodhuis.org>,
des@FreeBSD.org, "Zsh Hackers' List" <zsh-workers@sunsite.dk>
Subject: Re: zsh 4.3.6 FreeBSD bug
Date: Sun, 4 May 2008 19:37:46 +0100 [thread overview]
Message-ID: <20080504193746.1f663c4f@pws-pc> (raw)
In-Reply-To: <20080504131913.5b0b0ca5@pws-pc>
On Sun, 4 May 2008 13:19:13 +0100
Peter Stephenson <p.w.stephenson@ntlworld.com> wrote:
> I've now defined _XOPEN_SOURCE_EXTENDED to get wcwidth() even if curses
> doesn't need it, because that's an XSI function; presumably that doesn't
> want to happen on BSD either (it'll appear in the scope of the curses
> files)? If so we'll need to revise the scope of the definition you
> changed to mean never define _XOPEN_SOURCE_EXTENDED.
I think we probably want something like this.
Index: configure.ac
===================================================================
RCS file: /cvsroot/zsh/zsh/configure.ac,v
retrieving revision 1.99
diff -u -r1.99 configure.ac
--- configure.ac 26 Apr 2008 17:46:46 -0000 1.99
+++ configure.ac 4 May 2008 18:37:06 -0000
@@ -682,20 +682,20 @@
termcap_curses_order="$ncursesw_test tinfo termcap $ncurses_test curses" ;;
esac])dnl
-AH_TEMPLATE([ZSH_CURSES_NEEDS_XOPEN],
-[Define if the curses libraries need _XOPEN_SOURCE_EXTENDED defined])
-AC_CACHE_CHECK(if the curses library needs _XOPEN_SOURCE_EXTENDED,
-zsh_cv_curses_needs_xopen,
+AH_TEMPLATE([ZSH_NO_XOPEN],
+[Define if _XOPEN_SOURCE_EXTENDED should not be defined to avoid clashes])
+AC_CACHE_CHECK(if _XOPEN_SOURCE_EXTENDED should not be defined,
+zsh_cv_no_xopen,
[case "$host_os" in
- *openbsd*)
- zsh_cv_curses_needs_xopen=no
+ *openbsd*|*freebsd*)
+ zsh_cv_no_xopen=yes
;;
*)
- zsh_cv_curses_needs_xopen=yes
+ zsh_cv_no_xopen=no
;;
esac])
-if test x$zsh_cv_curses_needs_xopen = xyes; then
- AC_DEFINE(ZSH_CURSES_NEEDS_XOPEN)
+if test x$zsh_cv_no_xopen = xyes; then
+ AC_DEFINE(ZSH_NO_XOPEN)
fi
dnl Check for tigetflag (terminfo) before tgetent (termcap).
Index: Src/system.h
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/system.h,v
retrieving revision 1.51
diff -u -r1.51 system.h
--- Src/system.h 23 Apr 2008 10:35:29 -0000 1.51
+++ Src/system.h 4 May 2008 18:37:10 -0000
@@ -52,19 +52,20 @@
# undef HAVE_SYS_UTSNAME_H
#endif
-#if defined(ZSH_CURSES_SOURCE) && defined(ZSH_CURSES_NEEDS_XOPEN)
-# define _XOPEN_SOURCE_EXTENDED 1
-#else
-# ifdef MULTIBYTE_SUPPORT
+#ifndef ZSH_NO_XOPEN
+# ifdef ZSH_CURSES_SOURCE
+# define _XOPEN_SOURCE_EXTENDED 1
+# else
+# ifdef MULTIBYTE_SUPPORT
/*
* Needed for wcwidth() which is part of XSI.
* Various other uses of the interface mean we can't get away with just
* _XOPEN_SOURCE.
*/
-/*# define _XOPEN_SOURCE 1*/
-# define _XOPEN_SOURCE_EXTENDED 1
-# endif
-#endif
+# define _XOPEN_SOURCE_EXTENDED 1
+# endif /* MULTIBYTE_SUPPORT */
+# endif /* ZSH_CURSES_SOURCE */
+#endif /* ZSH_NO_XOPEN */
/*
* Solaris by default zeroes all elements of the tm structure in
--
Peter Stephenson <p.w.stephenson@ntlworld.com>
Web page now at http://homepage.ntlworld.com/p.w.stephenson/
next prev parent reply other threads:[~2008-05-04 18:38 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-03 7:39 Phil Pennock
2008-05-04 12:08 ` Dag-Erling Smørgrav
2008-05-04 12:25 ` Dag-Erling Smørgrav
2008-05-05 22:02 ` Phil Pennock
2008-05-06 8:51 ` Peter Stephenson
2008-05-06 10:05 ` Dag-Erling Smørgrav
2008-05-06 9:11 ` Dag-Erling Smørgrav
2008-05-06 9:13 ` Dag-Erling Smørgrav
2008-05-06 9:24 ` Peter Stephenson
2008-05-06 10:24 ` Dag-Erling Smørgrav
2008-05-06 10:26 ` Peter Stephenson
2008-05-06 10:30 ` Dag-Erling Smørgrav
2008-05-06 10:42 ` Peter Stephenson
2008-05-06 11:51 ` Dag-Erling Smørgrav
2008-05-04 12:19 ` Peter Stephenson
2008-05-04 18:37 ` Peter Stephenson [this message]
2008-05-05 0:38 ` Phil Pennock
2008-05-05 0:41 ` Phil Pennock
2008-05-05 14:05 ` Peter Stephenson
2008-05-05 20:02 ` Jun T.
2008-05-06 2:32 ` Phil Pennock
2008-05-05 7:56 ` Dag-Erling Smørgrav
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080504193746.1f663c4f@pws-pc \
--to=p.w.stephenson@ntlworld.com \
--cc=des@FreeBSD.org \
--cc=zsh-workers+phil.pennock@spodhuis.org \
--cc=zsh-workers@sunsite.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).