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
This commit is contained in:
parent
b1d4a96983
commit
b9944b43b5
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user