diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-03 22:23:32 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-03 22:23:32 +0000 |
| commit | 63face35655a24d62de29df01ad10da2cf78b94f (patch) | |
| tree | 24c3000029bf248a1fe8f421f8967bc5d299cc88 | |
| parent | 67c163e5630373f7bb25b57998a9c54778f28130 (diff) | |
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
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@127905 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | apps/Makefile | 5 | ||||
| -rw-r--r-- | main/editline/np/vis.c | 5 |
3 files changed, 4 insertions, 8 deletions
@@ -304,7 +304,7 @@ else 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 diff --git a/apps/Makefile b/apps/Makefile index 22b8f6d7a..d75b0301c 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -25,11 +25,6 @@ ifneq ($(findstring IMAP_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),) 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 diff --git a/main/editline/np/vis.c b/main/editline/np/vis.c index 7d9117faa..bd8192440 100644 --- a/main/editline/np/vis.c +++ b/main/editline/np/vis.c @@ -44,6 +44,7 @@ __RCSID("$NetBSD: vis.c,v 1.22 2002/03/23 17:38:27 christos Exp $"); #include <assert.h> #include "np/vis.h" #include <stdlib.h> +#include <stdint.h> #ifdef __weak_alias __weak_alias(strsvis,_strsvis) @@ -167,8 +168,8 @@ do { \ 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++ = '\\'; \ |