1
0
mirror of https://github.com/simh/simh.git synced 2026-05-05 23:34:21 +00:00

Fix issues observed by Sun C compiler

This commit is contained in:
Mark Pizzolato
2013-03-18 12:52:43 -07:00
parent 1e515d8357
commit 960c5b5873
10 changed files with 43 additions and 20 deletions

View File

@@ -63,17 +63,17 @@
0x0080, 0x0aa0, 0x0140, 0x00c8,
0x0081, 0x0aa0, 0x0140, 0x00c9,
0x0082, 0x0be2, 0x0140, 0x00ca,
0x0083, 0x08b6, 0x01e8, 0x00cb,
0x0083, 0x08b6, 0x01e8, 0x00cb,
0x0084, 0x0aa0, 0x0140, 0x00cd,
0x008c, 0x0000, 0x0134, 0x80ceU,
0x008c, 0x0000, 0x0134, (int16)0x80ce,
0x008d, 0x0000, 0x0113, 0x00cf,
0x008e, 0x0000, 0x011f, 0x00d0,
0x008f, 0x0000, 0x009c, 0x80d1U,
0x008f, 0x0000, 0x009c, (int16)0x80d1,
0x0090, 0x0000, 0x00ab, 0x00d2,
0x0091, 0x0000, 0x016c, 0x80d3U,
0x0091, 0x0000, 0x016c, (int16)0x80d3,
0x0092, 0x0000, 0x0174, 0x00d5,
0x0093, 0x0000, 0x00b9, 0x00d7,
0x0094, 0x0000, 0x0003, 0x80d8U,
0x0094, 0x0000, 0x0003, (int16)0x80d8,
0x0095, 0x0000, 0x0003, 0x00d9,
0x0096, 0x00f0, 0x00ec, 0x00da,
0x0097, 0x00f0, 0x01a2, 0x00db,

View File

@@ -12,9 +12,9 @@
#define _0_ '\0'
#define CENT_ '\xA2' /* cent and not: standard DOS mapping */
#define NOT_ '\xAC'
#define IGNR_ '\xFF'
#define CENT_ 0xA2 /* cent and not: standard DOS mapping */
#define NOT_ 0xAC
#define IGNR_ 0xFF
#define CRLF_ '\r'
#define COUT_IS_CTRL 0x01 /* conout characters with bit 1 set are controls: */

View File

@@ -505,7 +505,11 @@ static t_stat tto_reset (DEVICE *dptr)
}
#ifdef _MSC_VER
# pragma warning(disable:4245) /* enable int->char demotion warning caused by characters with high-bit set */
# pragma warning(disable:4245) /* disable int->char demotion warning caused by characters with high-bit set */
#endif
#ifdef __SUNPRO_C
# pragma error_messages (off, E_INIT_DOES_NOT_FIT) /* disable int->char demotion warning caused by characters with high-bit set */
#endif
static struct { /* default input mapping for APL */
@@ -666,6 +670,10 @@ static OS_MAP default_os_map[] = /* overstrike mapping for APLPLUS font */
'\xfe', 2, "\x3a\xa8",
};
#ifdef __SUNPRO_C
# pragma error_messages (default, E_INIT_DOES_NOT_FIT) /* enable int->char demotion warning caused by characters with high-bit set */
#endif
#ifdef _MSC_VER
# pragma warning(default:4245) /* enable int->char demotion warning */
#endif