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: https://origsvn.digium.com/svn/asterisk/trunk@127903 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
6cfe27089c
commit
6b06e9a8eb
2
Makefile
2
Makefile
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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++ = '\\'; \
|
||||
|
|
Loading…
Reference in New Issue