[svn-commits] kpfleming: branch 1.4 r127892 - in /branches/1.4: ./ main/editline/np/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Thu Jul  3 17:18:38 2008
New Revision: 127892

URL: http://svn.digium.com/view/asterisk?view=rev&rev=127892
Log:
a couple of small Solaris-related fixes

(closes issue #11885)
Reported by: snuffy, asgaroth


Modified:
    branches/1.4/Makefile
    branches/1.4/main/editline/np/vis.c

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/Makefile?view=diff&rev=127892&r1=127891&r2=127892
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Thu Jul  3 17:18:38 2008
@@ -281,7 +281,7 @@
 endif
 
 ifeq ($(OSARCH),SunOS)
-  SOLINK=-shared -fpic -L/usr/local/ssl/lib
+  SOLINK=-shared -fpic -L/usr/local/ssl/lib -lrt
 endif
 
 SUBMAKE=$(MAKE) --quiet --no-print-directory

Modified: branches/1.4/main/editline/np/vis.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/editline/np/vis.c?view=diff&rev=127892&r1=127891&r2=127892
==============================================================================
--- branches/1.4/main/editline/np/vis.c (original)
+++ branches/1.4/main/editline/np/vis.c Thu Jul  3 17:18:38 2008
@@ -44,6 +44,7 @@
 #include <assert.h>
 #include "np/vis.h"
 #include <stdlib.h>
+#include <stdint.h>
 
 #ifdef __weak_alias
 __weak_alias(strsvis,_strsvis)
@@ -167,8 +168,8 @@
 	if (isc) break;							      \
 	if (isextra || ((c & 0177) == ' ') || (flag & VIS_OCTAL)) {	      \
 		*dst++ = '\\';						      \
-		*dst++ = (u_char)(((u_int32_t)(u_char)c >> 6) & 03) + '0';    \
-		*dst++ = (u_char)(((u_int32_t)(u_char)c >> 3) & 07) + '0';    \
+		*dst++ = (u_char)(((uint32_t)(u_char)c >> 6) & 03) + '0';     \
+		*dst++ = (u_char)(((uint32_t)(u_char)c >> 3) & 07) + '0';     \
 		*dst++ =			     (c	      & 07) + '0';    \
 	} else {							      \
 		if ((flag & VIS_NOSLASH) == 0) *dst++ = '\\';		      \