kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-27 06:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 127903 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@127905 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-07-03 22:23:32 +00:00
parent 7b103e45f2
commit a2a2d2d0a0
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -304,7 +304,7 @@ else
endif endif
ifeq ($(OSARCH),SunOS) ifeq ($(OSARCH),SunOS)
SOLINK=-shared -fpic -L/usr/local/ssl/lib SOLINK=-shared -fpic -L/usr/local/ssl/lib -lrt
endif endif
# comment to print directories during submakes # comment to print directories during submakes

5
apps/Makefile
View File

@@ -25,11 +25,6 @@ ifneq ($(findstring IMAP_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),)
MENUSELECT_DEPENDS_app_directory+=$(MENUSELECT_DEPENDS_IMAP_STORAGE) MENUSELECT_DEPENDS_app_directory+=$(MENUSELECT_DEPENDS_IMAP_STORAGE)
endif endif
ifeq (SunOS,$(shell uname))
MENUSELECT_DEPENDS_app_chanspy+=RT
RT_LIB=-lrt
endif
all: _all all: _all
include $(ASTTOPDIR)/Makefile.moddir_rules include $(ASTTOPDIR)/Makefile.moddir_rules

5
main/editline/np/vis.c
View File

@@ -44,6 +44,7 @@ __RCSID("$NetBSD: vis.c,v 1.22 2002/03/23 17:38:27 christos Exp $");
#include <assert.h> #include <assert.h>
#include "np/vis.h" #include "np/vis.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h>
#ifdef __weak_alias #ifdef __weak_alias
__weak_alias(strsvis,_strsvis) __weak_alias(strsvis,_strsvis)
@@ -167,8 +168,8 @@ do { \
if (isc) break; \ if (isc) break; \
if (isextra || ((c & 0177) == ' ') || (flag & VIS_OCTAL)) { \ if (isextra || ((c & 0177) == ' ') || (flag & VIS_OCTAL)) { \
*dst++ = '\\'; \ *dst++ = '\\'; \
*dst++ = (u_char)(((u_int32_t)(u_char)c >> 6) & 03) + '0'; \ *dst++ = (u_char)(((uint32_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 >> 3) & 07) + '0'; \
*dst++ = (c & 07) + '0'; \ *dst++ = (c & 07) + '0'; \
} else { \ } else { \
if ((flag & VIS_NOSLASH) == 0) *dst++ = '\\'; \ if ((flag & VIS_NOSLASH) == 0) *dst++ = '\\'; \