From b9944b43b541d616acd97f7d7f7f96f9b8483d29 Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Thu, 7 Nov 2013 19:38:23 +0000
Subject: [PATCH] Some small fixes - bochs.h:     fixed gcc 4.8 warning -
 config.h.in: fixed newline - extplugin.h: fixed VS2008Ex plugins compilation
 - gui.cc:      fixed tooltip

---
 bochs/bochs.h     | 2 +-
 bochs/config.h.in | 4 ++--
 bochs/extplugin.h | 4 ++--
 bochs/gui/gui.cc  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bochs/bochs.h b/bochs/bochs.h
index f1b654d3c..aec64db79 100644
--- a/bochs/bochs.h
+++ b/bochs/bochs.h
@@ -331,7 +331,7 @@ protected:
   const char *logfn;
 };
 
-typedef class BOCHSAPI iofunctions iofunc_t;
+typedef class iofunctions iofunc_t;
 
 #define SAFE_GET_IOFUNC() \
   ((io==NULL)? (io=new iofunc_t("/dev/stderr")) : io)
diff --git a/bochs/config.h.in b/bochs/config.h.in
index c6867797c..3b77fe978 100644
--- a/bochs/config.h.in
+++ b/bochs/config.h.in
@@ -1,5 +1,5 @@
 //
-//  Copyright (C) 2001-2012  The Bochs Project
+//  Copyright (C) 2001-2013  The Bochs Project
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -567,7 +567,7 @@ typedef
 
 #define HAVE_SIGACTION 1
 
-#ifndef __cplusplus
+#ifndef __cplusplus
 
 // configure will change the definition of "inline" to the value
 // that the C compiler allows.  It tests the following keywords to
diff --git a/bochs/extplugin.h b/bochs/extplugin.h
index c0ba9b4ef..29113a149 100644
--- a/bochs/extplugin.h
+++ b/bochs/extplugin.h
@@ -17,10 +17,10 @@
 #ifndef __EXTPLUGIN_H
 #define __EXTPLUGIN_H
 
-#if BX_PLUGINS
+#if BX_PLUGINS && !defined(_MSC_VER)
 #if BX_HAVE_LTDL
 #include <ltdl.h>
-#elif !defined(_MSC_VER)
+#else
 #include "ltdl.h"
 #endif
 #endif
diff --git a/bochs/gui/gui.cc b/bochs/gui/gui.cc
index bb6c8fabb..2b91fb203 100644
--- a/bochs/gui/gui.cc
+++ b/bochs/gui/gui.cc
@@ -236,7 +236,7 @@ void bx_gui_c::init(int argc, char **argv, unsigned max_xres, unsigned max_yres,
   // Snapshot button
   BX_GUI_THIS snapshot_hbar_id = headerbar_bitmap(BX_GUI_THIS snapshot_bmap_id,
                           BX_GRAVITY_RIGHT, snapshot_handler);
-  BX_GUI_THIS set_tooltip(BX_GUI_THIS snapshot_hbar_id, "Save snapshot of the text mode screen");
+  BX_GUI_THIS set_tooltip(BX_GUI_THIS snapshot_hbar_id, "Save snapshot of the Bochs screen");
   // Paste button
   BX_GUI_THIS paste_hbar_id = headerbar_bitmap(BX_GUI_THIS paste_bmap_id,
                           BX_GRAVITY_RIGHT, paste_handler);