(MSVC) Some MSVC buildfixes

This commit is contained in:
twinaphex 2015-07-09 00:24:10 +02:00
parent 68f400bd9f
commit 387d687ef9
4 changed files with 28 additions and 13 deletions

View File

@ -772,6 +772,7 @@ static int glui_environ(menu_environ_cb_t type, void *data)
{
switch (type)
{
case 0:
default:
return -1;
}

View File

@ -741,6 +741,7 @@ static int rgui_environ(menu_environ_cb_t type, void *data)
{
switch (type)
{
case 0:
default:
return -1;
}

View File

@ -87,7 +87,8 @@ void *rarch_main_data_nbio_get_ptr(void)
msg_queue_t *rarch_main_data_nbio_get_msg_queue_ptr(void)
{
nbio_handle_t *nbio = rarch_main_data_nbio_get_ptr();
nbio_handle_t *nbio = (nbio_handle_t*)
rarch_main_data_nbio_get_ptr();
if (!nbio)
return NULL;
return nbio->msg_queue;
@ -95,7 +96,8 @@ msg_queue_t *rarch_main_data_nbio_get_msg_queue_ptr(void)
void *rarch_main_data_nbio_get_handle(void)
{
nbio_handle_t *nbio = rarch_main_data_nbio_get_ptr();
nbio_handle_t *nbio = (nbio_handle_t*)
rarch_main_data_nbio_get_ptr();
if (!nbio)
return NULL;
return nbio->handle;
@ -103,7 +105,8 @@ void *rarch_main_data_nbio_get_handle(void)
msg_queue_t *rarch_main_data_nbio_image_get_msg_queue_ptr(void)
{
nbio_handle_t *nbio = rarch_main_data_nbio_get_ptr();
nbio_handle_t *nbio = (nbio_handle_t*)
rarch_main_data_nbio_get_ptr();
if (!nbio)
return NULL;
#ifdef HAVE_RPNG
@ -115,7 +118,8 @@ msg_queue_t *rarch_main_data_nbio_image_get_msg_queue_ptr(void)
void *rarch_main_data_nbio_image_get_handle(void)
{
nbio_handle_t *nbio = rarch_main_data_nbio_get_ptr();
nbio_handle_t *nbio = (nbio_handle_t*)
rarch_main_data_nbio_get_ptr();
if (!nbio)
return NULL;
#ifdef HAVE_RPNG
@ -350,7 +354,8 @@ static int rarch_main_data_image_iterate_transfer_parse(nbio_handle_t *nbio)
void rarch_main_data_nbio_image_iterate(bool is_thread)
{
nbio_handle_t *nbio = rarch_main_data_nbio_get_ptr();
nbio_handle_t *nbio = (nbio_handle_t*)
rarch_main_data_nbio_get_ptr();
nbio_image_handle_t *image = nbio ? &nbio->image : NULL;
if (!image || !nbio)
@ -384,7 +389,8 @@ void rarch_main_data_nbio_image_iterate(bool is_thread)
void rarch_main_data_nbio_image_upload_iterate(bool is_thread)
{
nbio_handle_t *nbio = rarch_main_data_nbio_get_ptr();
nbio_handle_t *nbio = (nbio_handle_t*)
rarch_main_data_nbio_get_ptr();
nbio_image_handle_t *image = nbio ? &nbio->image : NULL;
if (!image || !nbio)
@ -624,7 +630,8 @@ static int rarch_main_data_nbio_iterate_parse(nbio_handle_t *nbio)
void rarch_main_data_nbio_iterate(bool is_thread)
{
nbio_handle_t *nbio = rarch_main_data_nbio_get_ptr();
nbio_handle_t *nbio = (nbio_handle_t*)
rarch_main_data_nbio_get_ptr();
if (!nbio)
return;
@ -652,7 +659,8 @@ void rarch_main_data_nbio_iterate(bool is_thread)
void rarch_main_data_nbio_init_msg_queue(void)
{
nbio_handle_t *nbio = rarch_main_data_nbio_get_ptr();
nbio_handle_t *nbio = (nbio_handle_t*)
rarch_main_data_nbio_get_ptr();
if (!nbio)
return;

View File

@ -437,7 +437,8 @@ static int rarch_main_data_http_iterate_transfer(void *data)
void rarch_main_data_http_iterate(bool is_thread)
{
http_handle_t *http = rarch_main_data_http_get_ptr();
http_handle_t *http = (http_handle_t*)
rarch_main_data_http_get_ptr();
if (!http)
return;
@ -470,7 +471,8 @@ void rarch_main_data_http_iterate(bool is_thread)
void rarch_main_data_http_init_msg_queue(void)
{
http_handle_t *http = rarch_main_data_http_get_ptr();
http_handle_t *http = (http_handle_t*)
rarch_main_data_http_get_ptr();
if (!http)
return;
@ -481,7 +483,8 @@ void rarch_main_data_http_init_msg_queue(void)
msg_queue_t *rarch_main_data_http_get_msg_queue_ptr(void)
{
http_handle_t *http = rarch_main_data_http_get_ptr();
http_handle_t *http = (http_handle_t*)
rarch_main_data_http_get_ptr();
if (!http)
return NULL;
return http->msg_queue;
@ -489,7 +492,8 @@ msg_queue_t *rarch_main_data_http_get_msg_queue_ptr(void)
void *rarch_main_data_http_get_handle(void)
{
http_handle_t *http = rarch_main_data_http_get_ptr();
http_handle_t *http = (http_handle_t*)
rarch_main_data_http_get_ptr();
if (!http)
return NULL;
if (http->handle == NULL)
@ -499,7 +503,8 @@ void *rarch_main_data_http_get_handle(void)
void *rarch_main_data_http_conn_get_handle(void)
{
http_handle_t *http = rarch_main_data_http_get_ptr();
http_handle_t *http = (http_handle_t*)
rarch_main_data_http_get_ptr();
if (!http)
return NULL;
if (http->connection.handle == NULL)