Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Libretro
flycast
Commits
6f27e712
Unverified
Commit
6f27e712
authored
May 07, 2021
by
Libretro-Admin
Committed by
GitHub
May 07, 2021
Browse files
Merge pull request #1077 from kwyxz/master
Restore Haiku build
parents
d05a2e45
32a2df76
Pipeline
#25917
passed with stage
in 4 minutes and 43 seconds
Changes
2
Pipelines
15
Hide whitespace changes
Inline
Side-by-side
core/log/StringUtil.h
View file @
6f27e712
...
...
@@ -11,7 +11,7 @@ constexpr u32 CODEPAGE_WINDOWS_1252 = 1252;
#include <locale.h>
#endif
#ifdef
HAVE_LIBNX
#if
def
ined(
HAVE_LIBNX
) || defined(__HAIKU__)
int
vasprintf
(
char
**
s
,
const
char
*
fmt
,
va_list
ap
)
{
va_list
ap2
;
...
...
core/network/net_platform.h
View file @
6f27e712
...
...
@@ -64,7 +64,7 @@ static inline void set_tcp_nodelay(sock_t fd)
#if defined(_WIN32)
struct
protoent
*
tcp_proto
=
getprotobyname
(
"TCP"
);
setsockopt
(
fd
,
tcp_proto
->
p_proto
,
TCP_NODELAY
,
(
const
char
*
)
&
optval
,
optlen
);
#elif !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
#elif !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
&& !defined(__HAIKU__)
setsockopt
(
fd
,
SOL_TCP
,
TCP_NODELAY
,
(
const
void
*
)
&
optval
,
optlen
);
#else
struct
protoent
*
tcp_proto
=
getprotobyname
(
"TCP"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment