claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Got rid of a lot of incorrect variable declaration and missing extern's, 86Box now successfully links when compiled with GCC 10.x.

Browse Source
This commit is contained in:
OBattler
2020-05-12 13:36:47 +02:00
parent cb6bedf70f
commit 241ad90b54
12 changed files with 56 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/86box/mem.h
View File

@@ -178,7 +178,7 @@ extern uintptr_t *writelookup2;
extern int writelnext;
extern uint32_t ram_mapped_addr[64];
mem_mapping_t base_mapping,
extern mem_mapping_t base_mapping,
ram_low_mapping,
#if 1
ram_mid_mapping,

14
src/include/86box/plat.h
View File

@@ -62,17 +62,17 @@ extern "C" {
#endif
/* Global variables residing in the platform module. */
GLOBAL int dopause, /* system is paused */
extern int dopause, /* system is paused */
doresize, /* screen resize requested */
quited, /* system exit requested */
mouse_capture; /* mouse is captured in app */
GLOBAL uint64_t timer_freq;
GLOBAL int infocus;
GLOBAL char emu_version[200]; /* version ID string */
GLOBAL int rctrl_is_lalt;
GLOBAL int update_icons;
extern uint64_t timer_freq;
extern int infocus;
extern char emu_version[200]; /* version ID string */
extern int rctrl_is_lalt;
extern int update_icons;
GLOBAL int unscaled_size_x, /* current unscaled size X */
extern int unscaled_size_x, /* current unscaled size X */
unscaled_size_y; /* current unscaled size Y */
/* System-related functions. */

40
src/include/86box/video.h
View File

@@ -292,26 +292,26 @@ extern const device_t paradise_wd90c11_device;
extern const device_t paradise_wd90c30_device;
/* S3 9XX/8XX/Vision/Trio */
const device_t s3_orchid_86c911_isa_device;
const device_t s3_metheus_premier_86c928_isa_device;
const device_t s3_metheus_premier_86c928_vlb_device;
const device_t s3_v7mirage_86c801_isa_device;
const device_t s3_phoenix_86c805_vlb_device;
const device_t s3_bahamas64_vlb_device;
const device_t s3_bahamas64_pci_device;
const device_t s3_9fx_vlb_device;
const device_t s3_9fx_pci_device;
const device_t s3_phoenix_trio32_vlb_device;
const device_t s3_phoenix_trio32_pci_device;
const device_t s3_phoenix_trio64_vlb_device;
const device_t s3_phoenix_trio64_onboard_pci_device;
const device_t s3_phoenix_trio64_pci_device;
const device_t s3_phoenix_vision864_pci_device;
const device_t s3_phoenix_vision864_vlb_device;
const device_t s3_diamond_stealth64_pci_device;
const device_t s3_diamond_stealth64_vlb_device;
const device_t s3_diamond_stealth64_964_pci_device;
const device_t s3_diamond_stealth64_964_vlb_device;
extern const device_t s3_orchid_86c911_isa_device;
extern const device_t s3_metheus_premier_86c928_isa_device;
extern const device_t s3_metheus_premier_86c928_vlb_device;
extern const device_t s3_v7mirage_86c801_isa_device;
extern const device_t s3_phoenix_86c805_vlb_device;
extern const device_t s3_bahamas64_vlb_device;
extern const device_t s3_bahamas64_pci_device;
extern const device_t s3_9fx_vlb_device;
extern const device_t s3_9fx_pci_device;
extern const device_t s3_phoenix_trio32_vlb_device;
extern const device_t s3_phoenix_trio32_pci_device;
extern const device_t s3_phoenix_trio64_vlb_device;
extern const device_t s3_phoenix_trio64_onboard_pci_device;
extern const device_t s3_phoenix_trio64_pci_device;
extern const device_t s3_phoenix_vision864_pci_device;
extern const device_t s3_phoenix_vision864_vlb_device;
extern const device_t s3_diamond_stealth64_pci_device;
extern const device_t s3_diamond_stealth64_vlb_device;
extern const device_t s3_diamond_stealth64_964_pci_device;
extern const device_t s3_diamond_stealth64_964_vlb_device;
/* S3 ViRGE */
extern const device_t s3_virge_vlb_device;