[asterisk-commits] qwell: branch 1.6.0 r179402 - in /branches/1.6.0: ./ main/editline/ main/edit...

[SVN commits to the Asterisk project]

Author: qwell
Date: Mon Mar  2 14:17:55 2009
New Revision: 179402

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=179402
Log:
Merged revisions 179396 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r179396 | qwell | 2009-03-02 14:16:51 -0600 (Mon, 02 Mar 2009) | 9 lines
  
  Merged revisions 179395 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r179395 | qwell | 2009-03-02 14:14:57 -0600 (Mon, 02 Mar 2009) | 1 line
    
    Remove several silly warnings in editline.  One about a broken preprocessor directive, and another about strlcpy/strlcat.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/editline/configure
    branches/1.6.0/main/editline/configure.in
    branches/1.6.0/main/editline/np/unvis.c
    branches/1.6.0/main/editline/sys.h

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/editline/configure.in
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/main/editline/configure.in?view=diff&rev=179402&r1=179401&r2=179402
==============================================================================
--- branches/1.6.0/main/editline/configure.in (original)
+++ branches/1.6.0/main/editline/configure.in Mon Mar  2 14:17:55 2009
@@ -99,6 +99,8 @@
 AC_CHECK_FUNCS(fgetln, , CCSRCS="$CCSRCS np/fgetln.c")
 AC_CHECK_FUNCS(strvis, , CCSRCS="$CCSRCS np/vis.c")
 AC_CHECK_FUNCS(strunvis, , CCSRCS="$CCSRCS np/unvis.c")
+AC_CHECK_FUNCS(strlcpy, , CCSRCS="$CCSRCS np/strlcpy.c")
+AC_CHECK_FUNCS(strlcat, , CCSRCS="$CCSRCS np/strlcat.c")
 
 AC_EGREP_CPP(yes,
 [#include <sys/cdefs.h>

Modified: branches/1.6.0/main/editline/np/unvis.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/main/editline/np/unvis.c?view=diff&rev=179402&r1=179401&r2=179402
==============================================================================
--- branches/1.6.0/main/editline/np/unvis.c (original)
+++ branches/1.6.0/main/editline/np/unvis.c Mon Mar  2 14:17:55 2009
@@ -61,7 +61,7 @@
     "warning: reference to compatibility unvis(); include <vis.h> for correct reference")
 #endif
 
-#if !HAVE_VIS_H
+#ifndef HAVE_VIS_H
 /*
  * decode driven by state machine
  */

Modified: branches/1.6.0/main/editline/sys.h
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/main/editline/sys.h?view=diff&rev=179402&r1=179401&r2=179402
==============================================================================
--- branches/1.6.0/main/editline/sys.h (original)
+++ branches/1.6.0/main/editline/sys.h Mon Mar  2 14:17:55 2009
@@ -74,6 +74,16 @@
 char	*fgetln(FILE *fp, size_t *len);
 #endif
 
+#ifndef HAVE_STRLCPY
+#define	strlcpy libedit_strlcpy
+size_t strlcpy(char *dst, const char *src, size_t siz);
+#endif
+
+#ifndef HAVE_STRLCAT
+#define	strlcat libedit_strlcat
+size_t strlcat(char *dst, const char *src, size_t siz);
+#endif
+
 #define	REGEX		/* Use POSIX.2 regular expression functions */
 #undef	REGEXP		/* Use UNIX V8 regular expression functions */