mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 22:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stub out some stuff that is preventing build from succeeeding on

Browse Source 
PS3. This should be made more portable and less hacky (isagain)
This commit is contained in:
twinaphex 2015-01-23 07:31:34 +01:00
parent 1078177ff2
commit dc21d84270
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
menu/menu_entries_cbs.c
View File

@ -1596,7 +1596,7 @@ static int deferred_push_database_manager_list_deferred(void *data, void *userda
{
unsigned i;
#ifdef HAVE_LIBRETRODB
int rv;
int rv = 1;
libretrodb_t db;
libretrodb_cursor_t cur;
struct rmsgpack_dom_value item;
@ -1609,6 +1609,7 @@ static int deferred_push_database_manager_list_deferred(void *data, void *userda
return -1;
(void)info;
(void)rv;
menu_list_clear(list);
#ifdef HAVE_LIBRETRODB

23
net_http.c
View File

@ -18,6 +18,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <fcntl.h>
#include "netplay_compat.h"
enum
@ -77,7 +78,7 @@ static bool net_http_parse_url(char *url, char **domain,
static int net_http_new_socket(const char * domain, int port)
{
int fd;
int fd, i = 1;
#ifndef _WIN32
struct timeval timeout;
#endif
@ -111,11 +112,15 @@ static int net_http_new_socket(const char * domain, int port)
}
freeaddrinfo_rarch(addr);
#ifndef _WIN32
/* Linux claims to not know that select() should only
* give sockets where read() is nonblocking */
fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0)|O_NONBLOCK);
#ifdef __CELLOS_LV2__
setsockopt(fd, SOL_SOCKET, SO_NBIO, &i, sizeof(int));
setsockopt(fd, SOL_SOCKET, SO_NBIO, &i, sizeof(int));
#else
fcntl(fd, F_SETFL, O_NONBLOCK);
fcntl(fd, F_SETFL, O_NONBLOCK);
#endif
return fd;
}
@ -132,8 +137,12 @@ static void net_http_send(int fd, bool * error,
if (thislen <= 0)
{
#if 0
/* FIXME - EWOULDBLOCK is not there on PS3, and this is kinda ugly code anyway.
* Can we get rid of the ugly macro here and do something sensible here? */
if (!isagain(thislen))
continue;
#endif
*error=true;
return;
@ -163,8 +172,12 @@ static ssize_t net_http_recv(int fd, bool *error,
return bytes;
else if (bytes == 0)
return -1;
#if 0
/* FIXME - EWOULDBLOCK is not there on PS3, and this is kinda ugly code anyway.
* Can we get rid of the ugly macro here and do something sensible here? */
else if (isagain(bytes))
return 0;
#endif
*error=true;
return -1;

2
netplay_compat.h
View File

@ -50,7 +50,7 @@
#include <fcntl.h>
#include <errno.h>
#define isagain(bytes) (bytes<0 && (errno==EAGAIN || errno==EWOULDBLOCK))
#define isagain(bytes) (bytes < 0 && (errno == EAGAIN || errno == EWOULDBLOCK))
#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
#include <cell/sysmodule.h>
#include <netex/net.h>