Changeset d5a973af4dc59dcd0cec9c1ba19a791a320e63f5

Show
Ignore:
Timestamp:
06/22/08 16:53:23 (6 years ago)
Author:
Theo Schlossnagle <jesus@omniti.com>
git-committer:
Theo Schlossnagle <jesus@omniti.com> 1214153603 +0000
git-parent:

[9cd79790888b6da0ae66f6186b9ec2843f317a3c]

git-author:
Theo Schlossnagle <jesus@omniti.com> 1214153603 +0000
Message:

cleanup warnings and fix tputs in libedit, refs #34

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • configure.in

    r3277121 rd5a973a  
    113113AC_CHECK_LIB(termcap, tputs, , ) 
    114114AC_CHECK_LIB(curses, clear, , ) 
     115 
    115116CPPFLAGS="$CPPFLAGS `pcre-config --cflags`" 
    116117LDFLAGS="$LDFLAGS `pcre-config --libs`" 
     
    255256                 sys/ioctl_compat.h sys/filio.h util.h sys/time.h sys/mman.h \ 
    256257                 stropts.h sys/stream.h alloca.h) 
     258 
     259AC_MSG_CHECKING(for tputs() function final argument type) 
     260AC_EGREP_CPP([tputs.*[(][       ]*char[         ]*[)]], 
     261                [#if defined(HAVE_TERM_H) 
     262                 #include <term.h> 
     263                 #endif 
     264                 #if defined(HAVE_CURSES_H) 
     265                 #include <curses.h> 
     266                 #endif], 
     267                [AC_MSG_RESULT(char) 
     268                 AC_DEFINE(TPUTS_TAKES_CHAR)], 
     269                [AC_MSG_RESULT(not char)]) 
    257270 
    258271AC_CACHE_CHECK([for epoll support], ac_cv_have_epoll, [ 
  • src/noitedit/el_term.h

    r2c4eb5b rd5a973a  
    105105protected int   term_telltc(EditLine *, int, char **); 
    106106protected int   term_echotc(EditLine *, int, char **); 
     107#ifdef TPUTS_TAKES_CHAR 
     108protected int   term__putc(char); 
     109#else 
    107110protected int   term__putc(int); 
     111#endif 
    108112protected void  term__flush(void); 
    109113 
  • src/noitedit/readline.c

    r4c963d7 rd5a973a  
    6767#include "noitedit/fcns.h"              /* for EL_NUM_FCNS */ 
    6868 
     69extern int el_internal_read_char(EditLine *el, char *cp); 
     70extern int el_internal_read_getcmd(EditLine *el, el_action_t *cmdnum, char *ch, int nonblock); 
     71extern int el_gets_dispatch(EditLine *el, el_action_t cmdnum, char ch, int *num); 
     72 
    6973/* for rl_complete() */ 
    7074#define TAB             '\r' 
     
    387391        } 
    388392 
    389         num = el_internal_read_getcmd(e, &cmdnum, &ch); 
     393        num = el_internal_read_getcmd(e, &cmdnum, &ch, 0); 
    390394        if (num == -1) { 
    391395                if (cmdnum == ED_UNASSIGNED) 
  • src/noitedit/term.c

    r1d69a01 rd5a973a  
    12491249 */ 
    12501250protected int 
     1251#ifdef TPUTS_TAKES_CHAR 
     1252term__putc(char c) 
     1253#else 
    12511254term__putc(int c) 
     1255#endif 
    12521256{ 
    12531257        EditLine *el;