CDROM,WIN: guard header files against C/C++ mixup
This commit is contained in:
@@ -39,6 +39,9 @@
|
||||
#ifndef EMU_CDROM_H
|
||||
#define EMU_CDROM_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define CDROM_NUM 4
|
||||
|
||||
@@ -243,11 +246,6 @@ extern cdrom_ioctl_t cdrom_ioctl[CDROM_NUM];
|
||||
#define cdrom_ascq cdrom[id].sense[13]
|
||||
#define cdrom_drive cdrom_drives[id].host_drive
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
extern int (*ide_bus_master_read)(int channel, uint8_t *data, int transfer_length);
|
||||
extern int (*ide_bus_master_write)(int channel, uint8_t *data, int transfer_length);
|
||||
extern void (*ide_bus_master_set_irq)(int channel);
|
||||
|
||||
@@ -37,10 +37,16 @@
|
||||
#ifndef EMU_CDROM_NULL_H
|
||||
# define EMU_CDROM_NULL_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
extern int cdrom_null_open(uint8_t id, char d);
|
||||
extern void cdrom_null_reset(uint8_t id);
|
||||
extern void null_close(uint8_t id);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /*EMU_CDROM_NULL_H*/
|
||||
|
||||
@@ -39,6 +39,10 @@
|
||||
#ifndef PLAT_WIN_H
|
||||
# define PLAT_WIN_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
# define UNICODE
|
||||
# define BITMAP WINDOWS_BITMAP
|
||||
# if 0
|
||||
@@ -84,10 +88,6 @@ extern WCHAR wopenfilestring[260];
|
||||
extern uint8_t filterindex;
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#ifdef USE_CRASHDUMP
|
||||
extern void InitCrashDump(void);
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user