mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-13 00:04:53 +00:00
a couple of small Solaris-related fixes
(closes issue #11885) Reported by: snuffy, asgaroth git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@127892 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
2
Makefile
2
Makefile
@@ -281,7 +281,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
|
||||||
|
|
||||||
SUBMAKE=$(MAKE) --quiet --no-print-directory
|
SUBMAKE=$(MAKE) --quiet --no-print-directory
|
||||||
|
@@ -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++ = '\\'; \
|
||||||
|
Reference in New Issue
Block a user