From 4adc7552e49d362f7398b4edce9a5de310dbab20 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Fri, 27 Aug 2004 23:02:23 +0000
Subject: [PATCH] A few sunos updates.
---
src/conio/Common.gmake | 9 +++++++--
src/conio/console.c | 4 ++--
src/conio/vparams.h | 4 ++--
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/conio/Common.gmake b/src/conio/Common.gmake
index 6dbe3fccfa..f4b3a303e2 100644
--- a/src/conio/Common.gmake
+++ b/src/conio/Common.gmake
@@ -34,8 +34,13 @@ else
CURSES_LDFLAGS += -lncurses
CURSES_CFLAGS += -DN_CURSES_LIB
else
- CURSES_LDFLAGS += -lcurses
- CURSES_CFLAGS += -DCURSES_LIB
+ ifeq ($(os),sunos)
+ CURSES_LDFLAGS += -lncurses
+ CURSES_CFLAGS += -DN_CURSES_LIB
+ else
+ CURSES_LDFLAGS += -lcurses
+ CURSES_CFLAGS += -DCURSES_LIB
+ endif
endif
endif
diff --git a/src/conio/console.c b/src/conio/console.c
index b78420de35..19ec879bc3 100644
--- a/src/conio/console.c
+++ b/src/conio/console.c
@@ -1110,9 +1110,9 @@ init_mode(int mode)
pidx = vmode.paramindex;
/* Preset VGA registers. */
- memcpy(VGA_CRTC, (u_int8_t *)&videoparams[pidx][CRTC_Ofs],
+ memcpy(VGA_CRTC, (unsigned char *)&videoparams[pidx][CRTC_Ofs],
sizeof(VGA_CRTC));
- memcpy(VGA_ATC, (u_int8_t *)&videoparams[pidx][ATC_Ofs],
+ memcpy(VGA_ATC, (unsigned char *)&videoparams[pidx][ATC_Ofs],
sizeof(VGA_ATC));
VideoMode=mode & 0x7f;
diff --git a/src/conio/vparams.h b/src/conio/vparams.h
index 0a94c7dec5..de06dd1d85 100644
--- a/src/conio/vparams.h
+++ b/src/conio/vparams.h
@@ -36,7 +36,7 @@
supposed to be included only from 'video.c' and needs some type definitions
from 'video.h'. */
-u_int8_t videoparams[][64] = {
+unsigned char videoparams[][64] = {
/* Mode 0: Text, 40x25, CGA (200 lines) */
{ 0x28, 0x18, 0x08, 0x00, 0x08, 0x09, 0x03, 0x00,
0x02, 0x63, 0x2d, 0x27, 0x28, 0x90, 0x2b, 0xa0,
@@ -461,7 +461,7 @@ struct dac_colors dac_default256[] = {
/* The Static Functionality Table, a collection of mode-independent status
info. */
-u_int8_t static_functionality_table[] = {
+unsigned char static_functionality_table[] = {
0x0c, /* Video modes 0 - 7 */
0, /* Video modes 8 - 15 */
0, /* Video modes 16 - 23 */
--
GitLab