Some header cleanups

This commit is contained in:
twinaphex 2016-03-20 04:29:40 +01:00
parent ea7cf9d9ca
commit c46032c63a
2 changed files with 10 additions and 9 deletions

View File

@ -23,6 +23,8 @@
#include <retro_miscellaneous.h> #include <retro_miscellaneous.h>
#include <string/stdstring.h> #include <string/stdstring.h>
#include "libretro.h"
#include "core_options.h" #include "core_options.h"
struct core_option struct core_option
@ -77,9 +79,10 @@ void core_option_free(core_option_manager_t *opt)
free(opt); free(opt);
} }
void core_option_get(core_option_manager_t *opt, struct retro_variable *var) void core_option_get(core_option_manager_t *opt, void *data)
{ {
size_t i; size_t i;
struct retro_variable *var = (struct retro_variable*)data;
if (!opt) if (!opt)
return; return;
@ -166,11 +169,12 @@ static bool parse_variable(core_option_manager_t *opt, size_t idx,
* Returns: handle to new core manager handle, otherwise NULL. * Returns: handle to new core manager handle, otherwise NULL.
**/ **/
core_option_manager_t *core_option_new(const char *conf_path, core_option_manager_t *core_option_new(const char *conf_path,
const struct retro_variable *vars) const void *data)
{ {
const struct retro_variable *var; const struct retro_variable *var;
size_t size = 0; const struct retro_variable *vars = (const struct retro_variable*)data;
core_option_manager_t *opt = (core_option_manager_t*) size_t size = 0;
core_option_manager_t *opt = (core_option_manager_t*)
calloc(1, sizeof(*opt)); calloc(1, sizeof(*opt));
if (!opt) if (!opt)

View File

@ -22,8 +22,6 @@
#include <boolean.h> #include <boolean.h>
#include <string/string_list.h> #include <string/string_list.h>
#include "libretro.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -40,7 +38,7 @@ typedef struct core_option_manager core_option_manager_t;
* Returns: handle to new core manager handle, otherwise NULL. * Returns: handle to new core manager handle, otherwise NULL.
**/ **/
core_option_manager_t *core_option_new(const char *conf_path, core_option_manager_t *core_option_new(const char *conf_path,
const struct retro_variable *vars); const void *data);
/** /**
* core_option_updated: * core_option_updated:
@ -85,8 +83,7 @@ bool core_option_flush_game_specific(
**/ **/
void core_option_free(core_option_manager_t *opt); void core_option_free(core_option_manager_t *opt);
void core_option_get(core_option_manager_t *opt, void core_option_get(core_option_manager_t *opt, void *data);
struct retro_variable *var);
/** /**
* core_option_size: * core_option_size: