From 00bf370db28b87442ddb7782a0b819b2b07e29c4 Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Sun, 5 Sep 2004 21:09:46 +0000
Subject: [PATCH] - some compilation fixes for the raw serial support

---
 bochs/iodev/serial.cc | 4 ++--
 bochs/iodev/serial.h  | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/bochs/iodev/serial.cc b/bochs/iodev/serial.cc
index 95ec8e949..e4bb2c384 100644
--- a/bochs/iodev/serial.cc
+++ b/bochs/iodev/serial.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: serial.cc,v 1.56 2004-09-05 10:30:19 vruppert Exp $
+// $Id: serial.cc,v 1.57 2004-09-05 21:09:46 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2004  MandrakeSoft S.A.
@@ -566,7 +566,7 @@ bx_serial_c::write(Bit32u address, Bit32u value, unsigned io_len)
   bx_bool gen_int = 0;
   Bit8u offset, new_wordlen;
 #if USE_RAW_SERIAL
-  bx_bool mcr_changed;
+  bx_bool mcr_changed = 0;
   Bit8u p_mode;
 #endif
   Bit8u port = 0;
diff --git a/bochs/iodev/serial.h b/bochs/iodev/serial.h
index 77ec72e2f..30eb7bc31 100644
--- a/bochs/iodev/serial.h
+++ b/bochs/iodev/serial.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: serial.h,v 1.20 2004-09-05 10:30:19 vruppert Exp $
+// $Id: serial.h,v 1.21 2004-09-05 21:09:46 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2004  MandrakeSoft S.A.
@@ -76,6 +76,10 @@ enum {
   BX_SER_INT_FIFO
 };
 
+#if USE_RAW_SERIAL
+class serial_raw;
+#endif
+
 typedef struct {
   /*
    * UART internal state
@@ -108,7 +112,8 @@ typedef struct {
 
 #if USE_RAW_SERIAL
   serial_raw* raw;
-#elif defined(SERIAL_ENABLE)
+#endif
+#if defined(SERIAL_ENABLE)
   struct termios term_orig, term_new;
 #endif