Overview
| Comment: | Fix compilation with GCC |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
7b0f48419d3c41185c642f10226f7606 |
| User & Date: | js on 2018-08-04 23:54:25 |
| Other Links: | manifest | tags |
Context
|
2018-08-05
| ||
| 15:24 | OFDNSResolver: Let queries time out check-in: 452616df69 user: js tags: trunk | |
|
2018-08-04
| ||
| 23:54 | Fix compilation with GCC check-in: 7b0f48419d user: js tags: trunk | |
| 23:43 | OFDNSResolver: Improve error reporting check-in: 647ec47eda user: js tags: trunk | |
Changes
Modified src/OFStream.m from [7dfe0e045a] to [222e2d5c1c].
| ︙ | ︙ | |||
34 35 36 37 38 39 40 | #if !defined(OF_WINDOWS) && !defined(OF_MORPHOS) # include <signal.h> #endif #import "OFStream.h" #import "OFStream+Private.h" | | | | | > | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | #if !defined(OF_WINDOWS) && !defined(OF_MORPHOS) # include <signal.h> #endif #import "OFStream.h" #import "OFStream+Private.h" #import "OFData.h" #import "OFKernelEventObserver.h" #import "OFRunLoop+Private.h" #import "OFRunLoop.h" #import "OFString.h" #import "OFSystemInfo.h" #import "OFInvalidArgumentException.h" #import "OFInvalidFormatException.h" #import "OFNotImplementedException.h" #import "OFOutOfMemoryException.h" #import "OFOutOfRangeException.h" #import "OFSetOptionFailedException.h" |
| ︙ | ︙ | |||
1669 1670 1671 1672 1673 1674 1675 |
{
#if defined(HAVE_FCNTL)
bool readImplemented = false, writeImplemented = false;
@try {
int readFlags;
| | | > | | | 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 |
{
#if defined(HAVE_FCNTL)
bool readImplemented = false, writeImplemented = false;
@try {
int readFlags;
readFlags = fcntl([(id)self fileDescriptorForReading], F_GETFL);
readImplemented = true;
if (readFlags == -1)
@throw [OFSetOptionFailedException
exceptionWithObject: self
errNo: errno];
if (enable)
readFlags &= ~O_NONBLOCK;
else
readFlags |= O_NONBLOCK;
if (fcntl([(id)self fileDescriptorForReading], F_SETFL,
readFlags) == -1)
@throw [OFSetOptionFailedException
exceptionWithObject: self
errNo: errno];
} @catch (OFNotImplementedException *e) {
}
@try {
int writeFlags;
writeFlags =
fcntl([(id)self fileDescriptorForWriting], F_GETFL);
writeImplemented = true;
if (writeFlags == -1)
@throw [OFSetOptionFailedException
exceptionWithObject: self
errNo: errno];
if (enable)
writeFlags &= ~O_NONBLOCK;
else
writeFlags |= O_NONBLOCK;
if (fcntl([(id)self fileDescriptorForWriting], F_SETFL,
writeFlags) == -1)
@throw [OFSetOptionFailedException
exceptionWithObject: self
errNo: errno];
} @catch (OFNotImplementedException *e) {
}
|
| ︙ | ︙ |