Overview
| Comment: | Fix compilation with newer MinGW-w64 versions |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
0036c4c22ed1c85e677cb3f2fd5fdbcd |
| User & Date: | js on 2018-10-27 21:14:22 |
| Other Links: | manifest | tags |
Context
|
2018-10-27
| ||
| 22:38 | Only use dllexport when we have no shared library check-in: 5f6072bf22 user: js tags: trunk | |
| 21:14 | Fix compilation with newer MinGW-w64 versions check-in: 0036c4c22e user: js tags: trunk | |
| 21:06 | configure: MinGW no longer provides BOOL for ObjC check-in: 677e376bc9 user: js tags: trunk | |
Changes
Modified src/OFTCPSocket.m from [0378e7d3f9] to [44b284db49].
| ︙ | ︙ | |||
755 756 757 758 759 760 761 |
}
- (int)of_socketError
{
int errNo;
socklen_t len = sizeof(errNo);
| | > | 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 |
}
- (int)of_socketError
{
int errNo;
socklen_t len = sizeof(errNo);
if (getsockopt(_socket, SOL_SOCKET, SO_ERROR, (char *)&errNo,
&len) != 0)
return of_socket_errno();
return errNo;
}
- (void)connectToHost: (OFString *)host
port: (uint16_t)port
|
| ︙ | ︙ | |||
986 987 988 989 990 991 992 | _socket = INVALID_SOCKET; @throw [OFBindFailedException exceptionWithHost: host port: port socket: self errNo: EAFNOSUPPORT]; } | | < > | 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 |
_socket = INVALID_SOCKET;
@throw [OFBindFailedException exceptionWithHost: host
port: port
socket: self
errNo: EAFNOSUPPORT];
}
#else
closesocket(_socket);
_socket = INVALID_SOCKET;
@throw [OFBindFailedException exceptionWithHost: host
port: port
socket: self
errNo: EADDRNOTAVAIL];
#endif
}
- (void)listen
{
[self listenWithBacklog: SOMAXCONN];
}
|
| ︙ | ︙ |
Modified src/OFUDPSocket.m from [073268c5ca] to [11089b6c20].
| ︙ | ︙ | |||
236 237 238 239 240 241 242 | host = of_socket_address_ip_string(address, &port); @throw [OFBindFailedException exceptionWithHost: host port: port socket: self errNo: EAFNOSUPPORT]; } | | < > | 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 |
host = of_socket_address_ip_string(address, &port);
@throw [OFBindFailedException exceptionWithHost: host
port: port
socket: self
errNo: EAFNOSUPPORT];
}
#else
closesocket(_socket);
_socket = INVALID_SOCKET;
host = of_socket_address_ip_string(address, &port);
@throw [OFBindFailedException exceptionWithHost: host
port: port
socket: self
errNo: EADDRNOTAVAIL];
#endif
}
- (uint16_t)bindToHost: (OFString *)host
port: (uint16_t)port
{
void *pool = objc_autoreleasePoolPush();
OFData *socketAddresses;
|
| ︙ | ︙ |
Modified src/OFWindowsRegistryKey.m from [b87f081cd6] to [4633d2d088].
| ︙ | ︙ | |||
13 14 15 16 17 18 19 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" | | | | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #import "OFWindowsRegistryKey.h" #include <windows.h> #import "OFCreateWindowsRegistryKeyFailedException.h" #import "OFOpenWindowsRegistryKeyFailedException.h" #import "OFReadWindowsRegistryValueFailedException.h" @interface OFWindowsRegistryKey () - (instancetype)of_initWithHKey: (HKEY)hKey |
| ︙ | ︙ |