Overview
Comment: | Include unistd.h in socket_helpers.h |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
32ad39007a654e8ff23b29b6e84ea243 |
User & Date: | js on 2014-01-26 13:32:14 |
Other Links: | manifest | tags |
Context
2014-01-26
| ||
22:38 | Move resolving functionality to resolver.m check-in: 49b1989b63 user: js tags: trunk | |
13:32 | Include unistd.h in socket_helpers.h check-in: 32ad39007a user: js tags: trunk | |
2014-01-25
| ||
19:33 | Move socket includes and helpers to separate files check-in: 81d47f4398 user: js tags: trunk | |
Changes
Modified ObjFW.xcodeproj/project.pbxproj from [e2f235676e] to [ecac0687dd].
︙ | ︙ | |||
734 735 736 737 738 739 740 741 742 743 744 745 746 747 | 4B7161AC17A6FC7600B74970 /* OFHTTPResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFHTTPResponse.m; path = src/OFHTTPResponse.m; sourceTree = "<group>"; }; 4B745BA3168B25E600A6C20E /* OFSystemInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFSystemInfo.h; path = src/OFSystemInfo.h; sourceTree = "<group>"; }; 4B745BA4168B25E600A6C20E /* OFSystemInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFSystemInfo.m; path = src/OFSystemInfo.m; sourceTree = "<group>"; }; 4B7DD58118942FE200990FD6 /* socket_helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = socket_helpers.h; path = src/socket_helpers.h; sourceTree = "<group>"; }; 4B7DD5831894358400990FD6 /* OFMoveItemFailedException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFMoveItemFailedException.h; path = src/exceptions/OFMoveItemFailedException.h; sourceTree = "<group>"; }; 4B7DD5841894358400990FD6 /* OFMoveItemFailedException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFMoveItemFailedException.m; path = src/exceptions/OFMoveItemFailedException.m; sourceTree = "<group>"; }; 4B7DD58718943D4A00990FD6 /* socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = socket.h; path = src/socket.h; sourceTree = "<group>"; }; 4B7FF3B2133CED6100000324 /* OFConditionStillWaitingException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFConditionStillWaitingException.h; path = src/exceptions/OFConditionStillWaitingException.h; sourceTree = "<group>"; }; 4B7FF3B3133CED6100000324 /* OFConditionStillWaitingException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFConditionStillWaitingException.m; path = src/exceptions/OFConditionStillWaitingException.m; sourceTree = "<group>"; }; 4B837D7716829C5F007A3E83 /* block.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = block.h; path = src/block.h; sourceTree = "<group>"; }; 4B837D7816829C5F007A3E83 /* instance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = instance.h; path = src/instance.h; sourceTree = "<group>"; }; 4B83F0F2142FDEFD00E4A821 /* OFStreamObserver_kqueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFStreamObserver_kqueue.h; path = src/OFStreamObserver_kqueue.h; sourceTree = "<group>"; }; 4B83F0F3142FDEFD00E4A821 /* OFStreamObserver_kqueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFStreamObserver_kqueue.m; path = src/OFStreamObserver_kqueue.m; sourceTree = "<group>"; }; 4B86E7C917F8B98200ACA680 /* OFDeflateStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFDeflateStream.h; path = src/OFDeflateStream.h; sourceTree = "<group>"; }; | > | 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 | 4B7161AC17A6FC7600B74970 /* OFHTTPResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFHTTPResponse.m; path = src/OFHTTPResponse.m; sourceTree = "<group>"; }; 4B745BA3168B25E600A6C20E /* OFSystemInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFSystemInfo.h; path = src/OFSystemInfo.h; sourceTree = "<group>"; }; 4B745BA4168B25E600A6C20E /* OFSystemInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFSystemInfo.m; path = src/OFSystemInfo.m; sourceTree = "<group>"; }; 4B7DD58118942FE200990FD6 /* socket_helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = socket_helpers.h; path = src/socket_helpers.h; sourceTree = "<group>"; }; 4B7DD5831894358400990FD6 /* OFMoveItemFailedException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFMoveItemFailedException.h; path = src/exceptions/OFMoveItemFailedException.h; sourceTree = "<group>"; }; 4B7DD5841894358400990FD6 /* OFMoveItemFailedException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFMoveItemFailedException.m; path = src/exceptions/OFMoveItemFailedException.m; sourceTree = "<group>"; }; 4B7DD58718943D4A00990FD6 /* socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = socket.h; path = src/socket.h; sourceTree = "<group>"; }; 4B7DD58918944A7900990FD6 /* apple-forwarding-arm64.S */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; name = "apple-forwarding-arm64.S"; path = "src/forwarding/apple-forwarding-arm64.S"; sourceTree = "<group>"; }; 4B7FF3B2133CED6100000324 /* OFConditionStillWaitingException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFConditionStillWaitingException.h; path = src/exceptions/OFConditionStillWaitingException.h; sourceTree = "<group>"; }; 4B7FF3B3133CED6100000324 /* OFConditionStillWaitingException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFConditionStillWaitingException.m; path = src/exceptions/OFConditionStillWaitingException.m; sourceTree = "<group>"; }; 4B837D7716829C5F007A3E83 /* block.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = block.h; path = src/block.h; sourceTree = "<group>"; }; 4B837D7816829C5F007A3E83 /* instance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = instance.h; path = src/instance.h; sourceTree = "<group>"; }; 4B83F0F2142FDEFD00E4A821 /* OFStreamObserver_kqueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFStreamObserver_kqueue.h; path = src/OFStreamObserver_kqueue.h; sourceTree = "<group>"; }; 4B83F0F3142FDEFD00E4A821 /* OFStreamObserver_kqueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFStreamObserver_kqueue.m; path = src/OFStreamObserver_kqueue.m; sourceTree = "<group>"; }; 4B86E7C917F8B98200ACA680 /* OFDeflateStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFDeflateStream.h; path = src/OFDeflateStream.h; sourceTree = "<group>"; }; |
︙ | ︙ | |||
1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 | sourceTree = "<group>"; }; 4B5C112717E9AAC1003C917F /* Forwarding */ = { isa = PBXGroup; children = ( 4B5C112D17E9AAF6003C917F /* Supporting Files */, 4B5C112817E9AAED003C917F /* apple-forwarding-arm.S */, 4B5C112917E9AAED003C917F /* apple-forwarding-i386.S */, 4B5C112A17E9AAED003C917F /* apple-forwarding-ppc.S */, 4B5C112B17E9AAED003C917F /* apple-forwarding-x86_64.S */, 4B5C112C17E9AAED003C917F /* forwarding.S */, ); name = Forwarding; sourceTree = "<group>"; | > | 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 | sourceTree = "<group>"; }; 4B5C112717E9AAC1003C917F /* Forwarding */ = { isa = PBXGroup; children = ( 4B5C112D17E9AAF6003C917F /* Supporting Files */, 4B5C112817E9AAED003C917F /* apple-forwarding-arm.S */, 4B7DD58918944A7900990FD6 /* apple-forwarding-arm64.S */, 4B5C112917E9AAED003C917F /* apple-forwarding-i386.S */, 4B5C112A17E9AAED003C917F /* apple-forwarding-ppc.S */, 4B5C112B17E9AAED003C917F /* apple-forwarding-x86_64.S */, 4B5C112C17E9AAED003C917F /* forwarding.S */, ); name = Forwarding; sourceTree = "<group>"; |
︙ | ︙ |
Modified src/OFStreamObserver.m from [a3d6727f88] to [f63dde5192].
︙ | ︙ | |||
14 15 16 17 18 19 20 | * file. */ #include "config.h" #define __NO_EXT_QNX | < < | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * file. */ #include "config.h" #define __NO_EXT_QNX #include <assert.h> #import "OFStreamObserver.h" #import "OFStreamObserver+Private.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFStream.h" |
︙ | ︙ |
Modified src/OFStreamObserver_kqueue.m from [5ec1bb5587] to [7589354c0f].
︙ | ︙ | |||
13 14 15 16 17 18 19 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <math.h> | < > | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <math.h> #include <errno.h> #include <assert.h> #include <sys/types.h> #include <sys/event.h> #include <sys/time.h> #import "OFStreamObserver.h" #import "OFStreamObserver+Private.h" #import "OFStreamObserver_kqueue.h" #import "OFDataArray.h" #import "OFInitializationFailedException.h" #import "OFOutOfMemoryException.h" #import "OFOutOfRangeException.h" #import "autorelease.h" #import "macros.h" #import "socket_helpers.h" #define EVENTLIST_SIZE 64 @implementation OFStreamObserver_kqueue - init { self = [super init]; |
︙ | ︙ |
Modified src/OFStreamObserver_poll.m from [d72695f3f3] to [247da43586].
︙ | ︙ | |||
14 15 16 17 18 19 20 | * file. */ #include "config.h" #define __NO_EXT_QNX | < < | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * file. */ #include "config.h" #define __NO_EXT_QNX #ifdef HAVE_POLL_H # include <poll.h> #endif #import "OFStreamObserver.h" #import "OFStreamObserver+Private.h" #import "OFStreamObserver_poll.h" |
︙ | ︙ |
Modified src/OFStreamObserver_select.m from [deba7055bd] to [4391e8db5d].
︙ | ︙ | |||
16 17 18 19 20 21 22 | #include "config.h" #define __NO_EXT_QNX #include <string.h> #include <math.h> | < > | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | #include "config.h" #define __NO_EXT_QNX #include <string.h> #include <math.h> #include <sys/time.h> #import "OFStreamObserver.h" #import "OFStreamObserver+Private.h" #import "OFStreamObserver_select.h" #import "OFStream.h" #import "OFArray.h" #import "autorelease.h" #import "macros.h" #import "socket_helpers.h" @implementation OFStreamObserver_select - init { self = [super init]; FD_ZERO(&_readFDs); |
︙ | ︙ |
Modified src/OFStreamSocket.m from [c2425f91c0] to [0ca4a3134a].
︙ | ︙ | |||
16 17 18 19 20 21 22 | #include "config.h" #define __NO_EXT_QNX #include <string.h> | < < | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | #include "config.h" #define __NO_EXT_QNX #include <string.h> #include <errno.h> #import "OFStreamSocket.h" #import "OFInitializationFailedException.h" #import "OFNotConnectedException.h" #import "OFReadFailedException.h" |
︙ | ︙ |
Modified src/OFTCPSocket.m from [f0c5480103] to [3aa4076627].
︙ | ︙ | |||
19 20 21 22 23 24 25 | #define _WIN32_WINNT 0x0501 #define __NO_EXT_QNX #include <stdio.h> #include <stdlib.h> #include <string.h> | < < | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | #define _WIN32_WINNT 0x0501 #define __NO_EXT_QNX #include <stdio.h> #include <stdlib.h> #include <string.h> #import "OFTCPSocket.h" #import "OFTCPSocket+SOCKS5.h" #import "OFString.h" #import "OFThread.h" #import "OFTimer.h" #import "OFRunLoop.h" #import "OFRunLoop+Private.h" |
︙ | ︙ |
Modified src/socket_helpers.h from [7c99ba232e] to [7262da62a1].
︙ | ︙ | |||
9 10 11 12 13 14 15 16 17 18 19 20 21 22 | * the packaging of this file. * * Alternatively, it may be distributed under the terms of the GNU General * 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. */ #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif #ifdef HAVE_ARPA_INET_H # include <arpa/inet.h> #endif | > > | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | * the packaging of this file. * * Alternatively, it may be distributed under the terms of the GNU General * 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 <unistd.h> #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif #ifdef HAVE_ARPA_INET_H # include <arpa/inet.h> #endif |
︙ | ︙ |