mirror of https://github.com/bochs-emu/Bochs
- add typecast to keep gcc happy. on openbsd it's an actual error.
This commit is contained in:
Bryce Denney
parent
c8e1cc0c64
commit
babdddd5b9
|
|
@ -36,7 +36,7 @@ RCS file: /cvsroot/bochs/bochs/Makefile.in,v
|
|||
retrieving revision 1.62
|
||||
diff -u -r1.62 Makefile.in
|
||||
--- Makefile.in 2001/12/10 21:31:20 1.62
|
||||
+++ Makefile.in 2001/12/12 23:13:48
|
||||
+++ Makefile.in 2001/12/13 02:31:09
|
||||
@@ -78,7 +78,7 @@
|
||||
CXXFLAGS = @CXXFLAGS@ $(MCH_CFLAGS) $(FLA_FLAGS)
|
||||
|
||||
|
|
@ -94,7 +94,7 @@ RCS file: /cvsroot/bochs/bochs/bochs.h,v
|
|||
retrieving revision 1.56
|
||||
diff -u -r1.56 bochs.h
|
||||
--- bochs.h 2001/12/12 10:43:36 1.56
|
||||
+++ bochs.h 2001/12/12 23:13:48
|
||||
+++ bochs.h 2001/12/13 02:31:10
|
||||
@@ -73,6 +73,7 @@
|
||||
#include "osdep.h" /* platform dependent includes and defines */
|
||||
#include "debug/debug.h"
|
||||
|
|
@ -109,7 +109,7 @@ RCS file: /cvsroot/bochs/bochs/main.cc,v
|
|||
retrieving revision 1.80
|
||||
diff -u -r1.80 main.cc
|
||||
--- main.cc 2001/12/12 10:43:36 1.80
|
||||
+++ main.cc 2001/12/12 23:13:52
|
||||
+++ main.cc 2001/12/13 02:31:13
|
||||
@@ -118,7 +118,9 @@
|
||||
// if after init, notify the GUI
|
||||
if (set && SIM->get_init_done ()) {
|
||||
|
|
@ -137,8 +137,8 @@ Index: plugin.cc
|
|||
RCS file: plugin.cc
|
||||
diff -N plugin.cc
|
||||
--- /dev/null Thu May 24 22:33:05 2001
|
||||
+++ plugin.cc Wed Dec 12 15:13:52 2001
|
||||
@@ -0,0 +1,839 @@
|
||||
+++ plugin.cc Wed Dec 12 18:31:15 2001
|
||||
@@ -0,0 +1,841 @@
|
||||
+/*
|
||||
+ * plex86: run multiple x86 operating systems concurrently
|
||||
+ * Copyright (C) 1999-2000 The plex86 developers team
|
||||
|
|
@ -838,14 +838,16 @@ diff -N plugin.cc
|
|||
+ exit (1);
|
||||
+ }
|
||||
+
|
||||
+ plugin->init = dlsym (plugin->handle, PLUGIN_INIT);
|
||||
+ plugin->init =
|
||||
+ (int (*)(struct _plugin_t *, int, char *[])) /* monster typecast */
|
||||
+ dlsym (plugin->handle, PLUGIN_INIT);
|
||||
+ if ((plug_err = dlerror ()) != NULL)
|
||||
+ {
|
||||
+ BX_PANIC (("could not find init: %s", plug_err));
|
||||
+ plugin_abort ();
|
||||
+ }
|
||||
+
|
||||
+ plugin->fini = dlsym (plugin->handle, PLUGIN_FINI);
|
||||
+ plugin->fini = (void (*)(void)) dlsym (plugin->handle, PLUGIN_FINI);
|
||||
+ if ((plug_err = dlerror ()) != NULL)
|
||||
+ {
|
||||
+ BX_PANIC (("could not find fini: %s", plug_err));
|
||||
|
|
@ -983,7 +985,7 @@ Index: plugin.h
|
|||
RCS file: plugin.h
|
||||
diff -N plugin.h
|
||||
--- /dev/null Thu May 24 22:33:05 2001
|
||||
+++ plugin.h Wed Dec 12 15:13:53 2001
|
||||
+++ plugin.h Wed Dec 12 18:31:15 2001
|
||||
@@ -0,0 +1,338 @@
|
||||
+/*
|
||||
+ * plex86: run multiple x86 operating systems concurrently
|
||||
|
|
@ -1329,7 +1331,7 @@ RCS file: /cvsroot/bochs/bochs/gui/x.cc,v
|
|||
retrieving revision 1.24
|
||||
diff -u -r1.24 x.cc
|
||||
--- gui/x.cc 2001/12/08 13:42:55 1.24
|
||||
+++ gui/x.cc 2001/12/12 23:13:56
|
||||
+++ gui/x.cc 2001/12/13 02:31:17
|
||||
@@ -24,7 +24,6 @@
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
|
@ -1362,7 +1364,7 @@ RCS file: /cvsroot/bochs/bochs/iodev/Makefile.in,v
|
|||
retrieving revision 1.12
|
||||
diff -u -r1.12 Makefile.in
|
||||
--- iodev/Makefile.in 2001/12/07 21:56:15 1.12
|
||||
+++ iodev/Makefile.in 2001/12/12 23:13:56
|
||||
+++ iodev/Makefile.in 2001/12/13 02:31:18
|
||||
@@ -63,7 +63,7 @@
|
||||
floppy.o \
|
||||
harddrv.o \
|
||||
|
|
@ -1392,7 +1394,7 @@ RCS file: /cvsroot/bochs/bochs/iodev/devices.cc,v
|
|||
retrieving revision 1.18
|
||||
diff -u -r1.18 devices.cc
|
||||
--- iodev/devices.cc 2001/10/03 13:10:38 1.18
|
||||
+++ iodev/devices.cc 2001/12/12 23:13:56
|
||||
+++ iodev/devices.cc 2001/12/13 02:31:18
|
||||
@@ -56,7 +56,8 @@
|
||||
pci = NULL;
|
||||
#endif
|
||||
|
|
@ -1453,7 +1455,7 @@ RCS file: /cvsroot/bochs/bochs/iodev/iodev.h,v
|
|||
retrieving revision 1.10
|
||||
diff -u -r1.10 iodev.h
|
||||
--- iodev/iodev.h 2001/10/03 13:10:38 1.10
|
||||
+++ iodev/iodev.h 2001/12/12 23:13:56
|
||||
+++ iodev/iodev.h 2001/12/13 02:31:20
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
|
||||
|
|
@ -1487,7 +1489,7 @@ Index: iodev/plex-keyboard.cc
|
|||
RCS file: iodev/plex-keyboard.cc
|
||||
diff -N iodev/plex-keyboard.cc
|
||||
--- /dev/null Thu May 24 22:33:05 2001
|
||||
+++ iodev/plex-keyboard.cc Wed Dec 12 15:13:58 2001
|
||||
+++ iodev/plex-keyboard.cc Wed Dec 12 18:31:21 2001
|
||||
@@ -0,0 +1,1360 @@
|
||||
+// Copyright (C) 2000 MandrakeSoft S.A.
|
||||
+//
|
||||
|
|
@ -2851,10 +2853,10 @@ diff -N iodev/plex-keyboard.cc
|
|||
+}
|
||||
Index: iodev/plex-keyboard.h
|
||||
===================================================================
|
||||
RCS file: iodev/plex-keyboard.h
|
||||
RCS file: plex-keyboard.h
|
||||
diff -N iodev/plex-keyboard.h
|
||||
--- /dev/null Thu May 24 22:33:05 2001
|
||||
+++ iodev/plex-keyboard.h Wed Dec 12 15:13:58 2001
|
||||
+++ iodev/plex-keyboard.h Wed Dec 12 18:31:21 2001
|
||||
@@ -0,0 +1,183 @@
|
||||
+// Copyright (C) 2000 MandrakeSoft S.A.
|
||||
+//
|
||||
|
|
|
|||
Loading…
Reference in New Issue