[svn-commits] kpfleming: branch 1.6.0 r127905 - in /branches/1.6.0: ./ apps/ main/editline/np/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Thu Jul  3 17:23:32 2008
New Revision: 127905

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

................
r127903 | kpfleming | 2008-07-03 17:23:04 -0500 (Thu, 03 Jul 2008) | 20 lines

Merged revisions 127892,127895 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r127892 | kpfleming | 2008-07-03 17:18:38 -0500 (Thu, 03 Jul 2008) | 6 lines

a couple of small Solaris-related fixes

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


........
r127895 | kpfleming | 2008-07-03 17:20:16 -0500 (Thu, 03 Jul 2008) | 3 lines

remove this, it has been moved to the main Makefile


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/Makefile
    branches/1.6.0/apps/Makefile
    branches/1.6.0/main/editline/np/vis.c

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

Modified: branches/1.6.0/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/Makefile?view=diff&rev=127905&r1=127904&r2=127905
==============================================================================
--- branches/1.6.0/Makefile (original)
+++ branches/1.6.0/Makefile Thu Jul  3 17:23:32 2008
@@ -304,7 +304,7 @@
 endif
 
 ifeq ($(OSARCH),SunOS)
-  SOLINK=-shared -fpic -L/usr/local/ssl/lib
+  SOLINK=-shared -fpic -L/usr/local/ssl/lib -lrt
 endif
 
 # comment to print directories during submakes

Modified: branches/1.6.0/apps/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/Makefile?view=diff&rev=127905&r1=127904&r2=127905
==============================================================================
--- branches/1.6.0/apps/Makefile (original)
+++ branches/1.6.0/apps/Makefile Thu Jul  3 17:23:32 2008
@@ -25,11 +25,6 @@
   MENUSELECT_DEPENDS_app_directory+=$(MENUSELECT_DEPENDS_IMAP_STORAGE)
 endif
 
-ifeq (SunOS,$(shell uname))
-  MENUSELECT_DEPENDS_app_chanspy+=RT
-  RT_LIB=-lrt
-endif
-
 all: _all
 
 include $(ASTTOPDIR)/Makefile.moddir_rules

Modified: branches/1.6.0/main/editline/np/vis.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/editline/np/vis.c?view=diff&rev=127905&r1=127904&r2=127905
==============================================================================
--- branches/1.6.0/main/editline/np/vis.c (original)
+++ branches/1.6.0/main/editline/np/vis.c Thu Jul  3 17:23:32 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++ = '\\';		      \