Differences From Artifact [222e2d5c1c]:
- File src/OFStream.m — part of check-in [7b0f48419d] at 2018-08-04 23:54:25 on branch trunk — Fix compilation with GCC (user: js, size: 36892) [annotate] [blame] [check-ins using]
To Artifact [e66876a272]:
- File
src/OFStream.m
— part of check-in
[bed2db0fd3]
at
2018-08-26 18:39:28
on branch trunk
— Fix compilation for Wii
This pretends that net_getsockopt() exists, which it does not yet. As
soon as it lands in libogc, this will work again. (user: js, size: 36963) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
25 26 27 28 29 30 31 32 33 34 35 36 37 38 | #include <stdio.h> #include <stdlib.h> #include <string.h> #ifdef HAVE_FCNTL_H # include <fcntl.h> #endif #include "platform.h" #if !defined(OF_WINDOWS) && !defined(OF_MORPHOS) # include <signal.h> #endif | > > > > | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | #include <stdio.h> #include <stdlib.h> #include <string.h> #ifdef HAVE_FCNTL_H # include <fcntl.h> #endif #ifdef OF_HAVE_SOCKETS # import "socket_helpers.h" #endif #include "platform.h" #if !defined(OF_WINDOWS) && !defined(OF_MORPHOS) # include <signal.h> #endif |
| ︙ | ︙ | |||
1670 1671 1672 1673 1674 1675 1676 |
{
#if defined(HAVE_FCNTL)
bool readImplemented = false, writeImplemented = false;
@try {
int readFlags;
| > | | 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 |
{
#if defined(HAVE_FCNTL)
bool readImplemented = false, writeImplemented = false;
@try {
int readFlags;
readFlags =
fcntl([(id)self fileDescriptorForReading], F_GETFL, 0);
readImplemented = true;
if (readFlags == -1)
@throw [OFSetOptionFailedException
exceptionWithObject: self
errNo: errno];
|
| ︙ | ︙ | |||
1696 1697 1698 1699 1700 1701 1702 |
} @catch (OFNotImplementedException *e) {
}
@try {
int writeFlags;
writeFlags =
| | | 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 |
} @catch (OFNotImplementedException *e) {
}
@try {
int writeFlags;
writeFlags =
fcntl([(id)self fileDescriptorForWriting], F_GETFL, 0);
writeImplemented = true;
if (writeFlags == -1)
@throw [OFSetOptionFailedException
exceptionWithObject: self
errNo: errno];
|
| ︙ | ︙ |