mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-24 17:00:32 +02:00
Code Releases Activity

30518: attempt to supply tgoto() prototype when missing only.

Browse source 
For Solaris 10 and earlier.
This commit is contained in:
Peter Stephenson 2012-06-21 08:45:02 +00:00
parent e71f43fbf7
commit cbb8a3c762
3 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,5 +1,8 @@
2012-06-21 Peter Stephenson <pws@csr.com> 2012-06-21 Peter Stephenson <pws@csr.com>
* 30518: configure.ac, Src/zsh_system.h: attempt to supply
tgoto() prototype only when missing for Solaris 10 and earlier.
* 30519 (correction noticed by Danek): MACHINES: try to * 30519 (correction noticed by Danek): MACHINES: try to
modernise. modernise.
@ -16379,5 +16382,5 @@
***************************************************** *****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL * This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5672 $ * $Revision: 1.5673 $
***************************************************** *****************************************************

4
Src/zsh_system.h
View file

@ -874,3 +874,7 @@ extern short ospeed;
# endif # endif
# endif # endif
#endif #endif
#ifdef TGOTO_PROTO_MISSING
char *tgoto(const char *cap, int col, int row);
#endif

18
configure.ac
View file

@ -1603,6 +1603,8 @@ AH_TEMPLATE([HAVE_NUMNAMES],
[Define if you have the terminfo numnames symbol.]) [Define if you have the terminfo numnames symbol.])
AH_TEMPLATE([HAVE_STRNAMES], AH_TEMPLATE([HAVE_STRNAMES],
[Define if you have the terminfo strnames symbol.]) [Define if you have the terminfo strnames symbol.])
AH_TEMPLATE([TGOTO_PROTO_MISSING],
[Define if there is no prototype for the tgoto() terminal function.])
if test x$zsh_cv_path_term_header != xnone; then if test x$zsh_cv_path_term_header != xnone; then
AC_DEFINE(ZSH_HAVE_TERM_H) AC_DEFINE(ZSH_HAVE_TERM_H)
@ -1618,26 +1620,42 @@ if test x$zsh_cv_path_term_header != xnone; then
AC_TRY_LINK($term_includes, [char **test = boolcodes; puts(*test);], AC_TRY_LINK($term_includes, [char **test = boolcodes; puts(*test);],
AC_DEFINE(HAVE_BOOLCODES) boolcodes=yes, boolcodes=no) AC_DEFINE(HAVE_BOOLCODES) boolcodes=yes, boolcodes=no)
AC_MSG_RESULT($boolcodes) AC_MSG_RESULT($boolcodes)
AC_MSG_CHECKING(if numcodes is available) AC_MSG_CHECKING(if numcodes is available)
AC_TRY_LINK($term_includes, [char **test = numcodes; puts(*test);], AC_TRY_LINK($term_includes, [char **test = numcodes; puts(*test);],
AC_DEFINE(HAVE_NUMCODES) numcodes=yes, numcodes=no) AC_DEFINE(HAVE_NUMCODES) numcodes=yes, numcodes=no)
AC_MSG_RESULT($numcodes) AC_MSG_RESULT($numcodes)
AC_MSG_CHECKING(if strcodes is available) AC_MSG_CHECKING(if strcodes is available)
AC_TRY_LINK($term_includes, [char **test = strcodes; puts(*test);], AC_TRY_LINK($term_includes, [char **test = strcodes; puts(*test);],
AC_DEFINE(HAVE_STRCODES) strcodes=yes, strcodes=no) AC_DEFINE(HAVE_STRCODES) strcodes=yes, strcodes=no)
AC_MSG_RESULT($strcodes) AC_MSG_RESULT($strcodes)
AC_MSG_CHECKING(if boolnames is available) AC_MSG_CHECKING(if boolnames is available)
AC_TRY_LINK($term_includes, [char **test = boolnames; puts(*test);], AC_TRY_LINK($term_includes, [char **test = boolnames; puts(*test);],
AC_DEFINE(HAVE_BOOLNAMES) boolnames=yes, boolnames=no) AC_DEFINE(HAVE_BOOLNAMES) boolnames=yes, boolnames=no)
AC_MSG_RESULT($boolnames) AC_MSG_RESULT($boolnames)
AC_MSG_CHECKING(if numnames is available) AC_MSG_CHECKING(if numnames is available)
AC_TRY_LINK($term_includes, [char **test = numnames; puts(*test);], AC_TRY_LINK($term_includes, [char **test = numnames; puts(*test);],
AC_DEFINE(HAVE_NUMNAMES) numnames=yes, numnames=no) AC_DEFINE(HAVE_NUMNAMES) numnames=yes, numnames=no)
AC_MSG_RESULT($numnames) AC_MSG_RESULT($numnames)
AC_MSG_CHECKING(if strnames is available) AC_MSG_CHECKING(if strnames is available)
AC_TRY_LINK($term_includes, [char **test = strnames; puts(*test);], AC_TRY_LINK($term_includes, [char **test = strnames; puts(*test);],
AC_DEFINE(HAVE_STRNAMES) strnames=yes, strnames=no) AC_DEFINE(HAVE_STRNAMES) strnames=yes, strnames=no)
AC_MSG_RESULT($strnames) AC_MSG_RESULT($strnames)
dnl There are apparently defective terminal library headers on some
dnl versions of Solaris before 11.
AC_MSG_CHECKING(if tgoto prototype is missing)
tgoto_includes="$term_includes
/* guaranteed to clash with any valid tgoto prototype */
extern void tgoto(int **stuff, float **more_stuff);"
AC_TRY_LINK($tgoto_includes,
[int *stuff; float *more_stuff; tgoto(&stuff, &more_stuff);],
AC_DEFINE(TGOTO_PROTO_MISSING) tgotoprotomissing=yes, tgotoprotomissing=no)
AC_MSG_RESULT($tgotoprotomissing)
else else
ZSH_TERM_H= ZSH_TERM_H=
fi fi