From cb29c576065adf5ab2929cb6f3ed9373cb29f745 Mon Sep 17 00:00:00 2001
From: Nathan Woods <npwoods@mess.org>
Date: Fri, 18 Jan 2008 12:39:13 +0000
Subject: [PATCH] Sync with MESS

---
 src/emu/cpu/i8039/i8039.c | 4 ++++
 src/emu/ui.c              | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/emu/cpu/i8039/i8039.c b/src/emu/cpu/i8039/i8039.c
index 521a02ba4d7..fe92faaac28 100644
--- a/src/emu/cpu/i8039/i8039.c
+++ b/src/emu/cpu/i8039/i8039.c
@@ -619,18 +619,22 @@ static void i8039_init (int index, int clock, const void *config, int (*irqcallb
 	R.timer = 0;
 }
 
+#if (HAS_I8035)
 static void i8035_init (int index, int clock, const void *config, int (*irqcallback)(int))
 {
 	i8039_init(index, clock, config, irqcallback);
 	R.ram_mask = 0x3F;
 	R.int_rom_size = 0x400;
 }
+#endif /* HAS_I8035 */
 
+#if (HAS_M58715)
 static void m58715_init (int index, int clock, const void *config, int (*irqcallback)(int))
 {
 	i8039_init(index, clock, config, irqcallback);
 	R.cpu_feature = FEATURE_M58715;
 }
+#endif /* HAS_M58715 */
 
 /****************************************************************************
  * Reset registers to their initial values
diff --git a/src/emu/ui.c b/src/emu/ui.c
index 690bd0208e4..821cc61182b 100644
--- a/src/emu/ui.c
+++ b/src/emu/ui.c
@@ -979,7 +979,7 @@ static int sprintf_warnings(char *buffer)
 		/* add one line per warning flag */
 #ifdef MESS
 		if (Machine->gamedrv->flags & GAME_COMPUTER)
-			bufptr += sprintf(bufptr, "%s\n\n%s\n", ui_getstring(UI_comp1), ui_getstring(UI_comp2));
+			bufptr += sprintf(bufptr, "%s\n\n%s\n", "The emulated system is a computer: ", "The keyboard emulation may not be 100% accurate.");
 #endif
 		if (Machine->gamedrv->flags & GAME_IMPERFECT_COLORS)
 			bufptr += sprintf(bufptr, "The colors aren't 100%% accurate.\n");