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

Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30

Browse Source 
# Conflicts:
#	src/cdrom/cdrom_image.c
#	src/cdrom/cdrom_image_backend.c
This commit is contained in:
RichardG867
2022-04-21 13:35:15 -03:00
parent fe026fa49e 7d6ad0d650
commit 2e2adc6945
190 changed files with 7184 additions and 3732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cdrom/cdrom_image.c
View File

@@ -16,9 +16,6 @@
* Copyright 2015-2019 Miran Grca.
* Copyright 2017-2019 bit.
*/
#define __USE_LARGEFILE64
#define _LARGEFILE_SOURCE
#define _LARGEFILE64_SOURCE
#include <inttypes.h>
#include <stdarg.h>
#include <stdio.h>
@@ -29,6 +26,7 @@
#define HAVE_STDARG_H
#include <86box/86box.h>
#include <86box/config.h>
#include <86box/path.h>
#include <86box/plat.h>
#include <86box/scsi_device.h>
#include <86box/cdrom_image_backend.h>