[svn-commits] tilghman: trunk r250303 - /trunk/main/editline/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Mar  3 09:54:28 2010
New Revision: 250303

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=250303
Log:
Eliminate remaining libedit warnings (shown in bamboo)

Modified:
    trunk/main/editline/Makefile.in
    trunk/main/editline/configure
    trunk/main/editline/configure.in
    trunk/main/editline/sys.h

Modified: trunk/main/editline/Makefile.in
URL: http://svnview.digium.com/svn/asterisk/trunk/main/editline/Makefile.in?view=diff&rev=250303&r1=250302&r2=250303
==============================================================================
--- trunk/main/editline/Makefile.in (original)
+++ trunk/main/editline/Makefile.in Wed Mar  3 09:54:28 2010
@@ -1,6 +1,8 @@
 #
 # Generic Makefile for libedit.
 #
+
+GREP=@GREP@
 
 OSTYPE=$(shell uname -s)
 define cyg_subst_sys

Modified: trunk/main/editline/configure.in
URL: http://svnview.digium.com/svn/asterisk/trunk/main/editline/configure.in?view=diff&rev=250303&r1=250302&r2=250303
==============================================================================
--- trunk/main/editline/configure.in (original)
+++ trunk/main/editline/configure.in Wed Mar  3 09:54:28 2010
@@ -77,6 +77,7 @@
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 AC_PATH_PROG(AR, ar, , $PATH)
+AC_PROG_GREP
 
 dnl Search for termcap access routines in termcap, tinfo, curses, and ncurses.
 AC_CHECK_LIB(termcap, tgetent, , \

Modified: trunk/main/editline/sys.h
URL: http://svnview.digium.com/svn/asterisk/trunk/main/editline/sys.h?view=diff&rev=250303&r1=250302&r2=250303
==============================================================================
--- trunk/main/editline/sys.h (original)
+++ trunk/main/editline/sys.h Wed Mar  3 09:54:28 2010
@@ -75,11 +75,13 @@
 #endif
 
 #ifndef HAVE_STRLCPY
+#undef strlcpy /* We define this in top-level Asterisk to point towards ast_copy_string */
 #define	strlcpy libedit_strlcpy
 size_t strlcpy(char *dst, const char *src, size_t siz);
 #endif
 
 #ifndef HAVE_STRLCAT
+#undef strlcat /* We define this in top-level Asterisk to point towards the ast_str_* APIs */
 #define	strlcat libedit_strlcat
 size_t strlcat(char *dst, const char *src, size_t siz);
 #endif