Merge remote-tracking branch 'origin/master' into cdrom_changes
This commit is contained in:
@@ -231,8 +231,8 @@ extern int device_get_instance(void);
|
||||
|
||||
extern const char *device_get_internal_name(const device_t *dev);
|
||||
|
||||
extern int machine_get_config_int(char *str);
|
||||
extern char *machine_get_config_string(char *str);
|
||||
extern int machine_get_config_int(char *str);
|
||||
extern const char *machine_get_config_string(char *str);
|
||||
|
||||
extern const device_t device_none;
|
||||
extern const device_t device_internal;
|
||||
|
||||
Reference in New Issue
Block a user