aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--apps/Makefile5
-rw-r--r--main/editline/np/vis.c5
3 files changed, 4 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 58cc0e98b..6411de029 100644
--- a/Makefile
+++ b/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
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++ = '\\'; \