ObjFW  Check-in [d31ec806ef]

Overview
Comment:Add unistd.h wrapper to make things less horrible
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: d31ec806efb12a97a5a2d3d63fab831a4fe2e9bfa5a3f210e2db72f37684832a
User & Date: js on 2017-05-27 10:33:09
Other Links: manifest | tags
Context
2017-05-27
13:58
OFApplication: Cast SIG_DFL to void (*)(int) check-in: ddf0fae30d user: js tags: trunk
10:33
Add unistd.h wrapper to make things less horrible check-in: d31ec806ef user: js tags: trunk
10:08
Make things work with glibc 2.17 and Clang 3.4.2 check-in: ec36a82d68 user: js tags: trunk
Changes

Modified ObjFW.xcodeproj/project.pbxproj from [8b5c112707] to [dd32986034].

897
898
899
900
901
902
903


904
905
906
907
908
909
910
		4BC176331D04963000C32718 /* OFTarArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BC176271D04963000C32718 /* OFTarArchive.m */; };
		4BC176341D04963000C32718 /* OFTarArchiveEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC176281D04963000C32718 /* OFTarArchiveEntry.h */; settings = {ATTRIBUTES = (Public, ); }; };
		4BC176351D04963000C32718 /* OFTarArchiveEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BC176291D04963000C32718 /* OFTarArchiveEntry.m */; };
		4BC176361D04963000C32718 /* OFTarArchiveEntry+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC1762A1D04963000C32718 /* OFTarArchiveEntry+Private.h */; };
		4BC1C3EB184B5EB200BBF50F /* OFMapTable+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC1C3EA184B5EB200BBF50F /* OFMapTable+Private.h */; };
		4BCAA9AF1772432F003EF859 /* OFMessagePackExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BCAA9AD1772432E003EF859 /* OFMessagePackExtension.h */; settings = {ATTRIBUTES = (Public, ); }; };
		4BCAA9B01772432F003EF859 /* OFMessagePackExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BCAA9AE1772432E003EF859 /* OFMessagePackExtension.m */; };


		4BD112611CCB73A60076FDB9 /* OFGZIPStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD1125F1CCB739A0076FDB9 /* OFGZIPStream.m */; };
		4BD112621CCB73A90076FDB9 /* OFGZIPStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD1125E1CCB739A0076FDB9 /* OFGZIPStream.h */; settings = {ATTRIBUTES = (Public, ); }; };
		4BD306311D46CEAE00E2F372 /* PBKDF2Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD306301D46CEAE00E2F372 /* PBKDF2Tests.m */; };
		4BD306341D46CEE300E2F372 /* pbkdf2.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD306321D46CEE300E2F372 /* pbkdf2.h */; settings = {ATTRIBUTES = (Public, ); }; };
		4BD306351D46CEE300E2F372 /* pbkdf2.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD306331D46CEE300E2F372 /* pbkdf2.m */; };
		4BD653C5143B8489006182F0 /* OFTCPSocket+SOCKS5.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD653C3143B8489006182F0 /* OFTCPSocket+SOCKS5.h */; settings = {ATTRIBUTES = (); }; };
		4BD653C6143B8489006182F0 /* OFTCPSocket+SOCKS5.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD653C4143B8489006182F0 /* OFTCPSocket+SOCKS5.m */; };







>
>







897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
		4BC176331D04963000C32718 /* OFTarArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BC176271D04963000C32718 /* OFTarArchive.m */; };
		4BC176341D04963000C32718 /* OFTarArchiveEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC176281D04963000C32718 /* OFTarArchiveEntry.h */; settings = {ATTRIBUTES = (Public, ); }; };
		4BC176351D04963000C32718 /* OFTarArchiveEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BC176291D04963000C32718 /* OFTarArchiveEntry.m */; };
		4BC176361D04963000C32718 /* OFTarArchiveEntry+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC1762A1D04963000C32718 /* OFTarArchiveEntry+Private.h */; };
		4BC1C3EB184B5EB200BBF50F /* OFMapTable+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC1C3EA184B5EB200BBF50F /* OFMapTable+Private.h */; };
		4BCAA9AF1772432F003EF859 /* OFMessagePackExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BCAA9AD1772432E003EF859 /* OFMessagePackExtension.h */; settings = {ATTRIBUTES = (Public, ); }; };
		4BCAA9B01772432F003EF859 /* OFMessagePackExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BCAA9AE1772432E003EF859 /* OFMessagePackExtension.m */; };
		4BCE4EC41ED98D1400502FF0 /* unistd_wrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BCE4EC31ED98D1400502FF0 /* unistd_wrapper.h */; };
		4BCE4EC51ED98D1400502FF0 /* unistd_wrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BCE4EC31ED98D1400502FF0 /* unistd_wrapper.h */; };
		4BD112611CCB73A60076FDB9 /* OFGZIPStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD1125F1CCB739A0076FDB9 /* OFGZIPStream.m */; };
		4BD112621CCB73A90076FDB9 /* OFGZIPStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD1125E1CCB739A0076FDB9 /* OFGZIPStream.h */; settings = {ATTRIBUTES = (Public, ); }; };
		4BD306311D46CEAE00E2F372 /* PBKDF2Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD306301D46CEAE00E2F372 /* PBKDF2Tests.m */; };
		4BD306341D46CEE300E2F372 /* pbkdf2.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD306321D46CEE300E2F372 /* pbkdf2.h */; settings = {ATTRIBUTES = (Public, ); }; };
		4BD306351D46CEE300E2F372 /* pbkdf2.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD306331D46CEE300E2F372 /* pbkdf2.m */; };
		4BD653C5143B8489006182F0 /* OFTCPSocket+SOCKS5.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD653C3143B8489006182F0 /* OFTCPSocket+SOCKS5.h */; settings = {ATTRIBUTES = (); }; };
		4BD653C6143B8489006182F0 /* OFTCPSocket+SOCKS5.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD653C4143B8489006182F0 /* OFTCPSocket+SOCKS5.m */; };
1571
1572
1573
1574
1575
1576
1577

1578
1579
1580
1581
1582
1583
1584
		4BC176271D04963000C32718 /* OFTarArchive.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFTarArchive.m; path = src/OFTarArchive.m; sourceTree = "<group>"; };
		4BC176281D04963000C32718 /* OFTarArchiveEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFTarArchiveEntry.h; path = src/OFTarArchiveEntry.h; sourceTree = "<group>"; };
		4BC176291D04963000C32718 /* OFTarArchiveEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFTarArchiveEntry.m; path = src/OFTarArchiveEntry.m; sourceTree = "<group>"; };
		4BC1762A1D04963000C32718 /* OFTarArchiveEntry+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OFTarArchiveEntry+Private.h"; path = "src/OFTarArchiveEntry+Private.h"; sourceTree = "<group>"; };
		4BC1C3EA184B5EB200BBF50F /* OFMapTable+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OFMapTable+Private.h"; path = "src/OFMapTable+Private.h"; sourceTree = "<group>"; };
		4BCAA9AD1772432E003EF859 /* OFMessagePackExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFMessagePackExtension.h; path = src/OFMessagePackExtension.h; sourceTree = "<group>"; };
		4BCAA9AE1772432E003EF859 /* OFMessagePackExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFMessagePackExtension.m; path = src/OFMessagePackExtension.m; sourceTree = "<group>"; };

		4BD1125E1CCB739A0076FDB9 /* OFGZIPStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFGZIPStream.h; path = src/OFGZIPStream.h; sourceTree = "<group>"; };
		4BD1125F1CCB739A0076FDB9 /* OFGZIPStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFGZIPStream.m; path = src/OFGZIPStream.m; sourceTree = "<group>"; };
		4BD306301D46CEAE00E2F372 /* PBKDF2Tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PBKDF2Tests.m; path = tests/PBKDF2Tests.m; sourceTree = "<group>"; };
		4BD306321D46CEE300E2F372 /* pbkdf2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pbkdf2.h; path = src/pbkdf2.h; sourceTree = "<group>"; };
		4BD306331D46CEE300E2F372 /* pbkdf2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = pbkdf2.m; path = src/pbkdf2.m; sourceTree = "<group>"; };
		4BD653C3143B8489006182F0 /* OFTCPSocket+SOCKS5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OFTCPSocket+SOCKS5.h"; path = "src/OFTCPSocket+SOCKS5.h"; sourceTree = "<group>"; };
		4BD653C4143B8489006182F0 /* OFTCPSocket+SOCKS5.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "OFTCPSocket+SOCKS5.m"; path = "src/OFTCPSocket+SOCKS5.m"; sourceTree = "<group>"; };







>







1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
		4BC176271D04963000C32718 /* OFTarArchive.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFTarArchive.m; path = src/OFTarArchive.m; sourceTree = "<group>"; };
		4BC176281D04963000C32718 /* OFTarArchiveEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFTarArchiveEntry.h; path = src/OFTarArchiveEntry.h; sourceTree = "<group>"; };
		4BC176291D04963000C32718 /* OFTarArchiveEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFTarArchiveEntry.m; path = src/OFTarArchiveEntry.m; sourceTree = "<group>"; };
		4BC1762A1D04963000C32718 /* OFTarArchiveEntry+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OFTarArchiveEntry+Private.h"; path = "src/OFTarArchiveEntry+Private.h"; sourceTree = "<group>"; };
		4BC1C3EA184B5EB200BBF50F /* OFMapTable+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OFMapTable+Private.h"; path = "src/OFMapTable+Private.h"; sourceTree = "<group>"; };
		4BCAA9AD1772432E003EF859 /* OFMessagePackExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFMessagePackExtension.h; path = src/OFMessagePackExtension.h; sourceTree = "<group>"; };
		4BCAA9AE1772432E003EF859 /* OFMessagePackExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFMessagePackExtension.m; path = src/OFMessagePackExtension.m; sourceTree = "<group>"; };
		4BCE4EC31ED98D1400502FF0 /* unistd_wrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = unistd_wrapper.h; path = src/unistd_wrapper.h; sourceTree = "<group>"; };
		4BD1125E1CCB739A0076FDB9 /* OFGZIPStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFGZIPStream.h; path = src/OFGZIPStream.h; sourceTree = "<group>"; };
		4BD1125F1CCB739A0076FDB9 /* OFGZIPStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFGZIPStream.m; path = src/OFGZIPStream.m; sourceTree = "<group>"; };
		4BD306301D46CEAE00E2F372 /* PBKDF2Tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PBKDF2Tests.m; path = tests/PBKDF2Tests.m; sourceTree = "<group>"; };
		4BD306321D46CEE300E2F372 /* pbkdf2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pbkdf2.h; path = src/pbkdf2.h; sourceTree = "<group>"; };
		4BD306331D46CEE300E2F372 /* pbkdf2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = pbkdf2.m; path = src/pbkdf2.m; sourceTree = "<group>"; };
		4BD653C3143B8489006182F0 /* OFTCPSocket+SOCKS5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OFTCPSocket+SOCKS5.h"; path = "src/OFTCPSocket+SOCKS5.h"; sourceTree = "<group>"; };
		4BD653C4143B8489006182F0 /* OFTCPSocket+SOCKS5.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "OFTCPSocket+SOCKS5.m"; path = "src/OFTCPSocket+SOCKS5.m"; sourceTree = "<group>"; };
2243
2244
2245
2246
2247
2248
2249

2250
2251
2252
2253
2254
2255
2256
				4B40EC1A189FE2650031E19E /* socket.m */,
				4B7DD58118942FE200990FD6 /* socket_helpers.h */,
				4B67998B1099E7C50041064A /* threading.h */,
				4B3379CE1979326A0088E97E /* threading.m */,
				4BABC29A197A8212006A93BD /* threading_pthread.m */,
				4B67998C1099E7C50041064A /* unicode.h */,
				4BFBDD1610A0724800051AFB /* unicode.m */,

			);
			name = ObjFW;
			sourceTree = "<group>";
		};
		4B6EF66D123535480076B512 /* Tests */ = {
			isa = PBXGroup;
			children = (







>







2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
				4B40EC1A189FE2650031E19E /* socket.m */,
				4B7DD58118942FE200990FD6 /* socket_helpers.h */,
				4B67998B1099E7C50041064A /* threading.h */,
				4B3379CE1979326A0088E97E /* threading.m */,
				4BABC29A197A8212006A93BD /* threading_pthread.m */,
				4B67998C1099E7C50041064A /* unicode.h */,
				4BFBDD1610A0724800051AFB /* unicode.m */,
				4BCE4EC31ED98D1400502FF0 /* unistd_wrapper.h */,
			);
			name = ObjFW;
			sourceTree = "<group>";
		};
		4B6EF66D123535480076B512 /* Tests */ = {
			isa = PBXGroup;
			children = (
2605
2606
2607
2608
2609
2610
2611

2612
2613
2614
2615
2616
2617
2618
				4B2C22A41DA292BE00735907 /* OFTarArchiveEntry+Private.h in Headers */,
				4B2C22A51DA292BE00735907 /* OFTCPSocket+SOCKS5.h in Headers */,
				4B2C22A61DA292BE00735907 /* OFThread+Private.h in Headers */,
				4B2C22A71DA292BE00735907 /* OFTimer+Private.h in Headers */,
				4B853CEC1EBFDEB000A4B2C4 /* OFXMLNode+Private.h in Headers */,
				4B2C22A81DA292BE00735907 /* OFZIPArchiveEntry+Private.h in Headers */,
				4B2C22AA1DA292BE00735907 /* socket_helpers.h in Headers */,

				4BFC37BE1E50E11C00EE1269 /* common.h in Headers */,
			);
			runOnlyForDeploymentPostprocessing = 0;
		};
		4B3D23731337FBC800DD29B8 /* Headers */ = {
			isa = PBXHeadersBuildPhase;
			buildActionMask = 2147483647;







>







2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
				4B2C22A41DA292BE00735907 /* OFTarArchiveEntry+Private.h in Headers */,
				4B2C22A51DA292BE00735907 /* OFTCPSocket+SOCKS5.h in Headers */,
				4B2C22A61DA292BE00735907 /* OFThread+Private.h in Headers */,
				4B2C22A71DA292BE00735907 /* OFTimer+Private.h in Headers */,
				4B853CEC1EBFDEB000A4B2C4 /* OFXMLNode+Private.h in Headers */,
				4B2C22A81DA292BE00735907 /* OFZIPArchiveEntry+Private.h in Headers */,
				4B2C22AA1DA292BE00735907 /* socket_helpers.h in Headers */,
				4BCE4EC51ED98D1400502FF0 /* unistd_wrapper.h in Headers */,
				4BFC37BE1E50E11C00EE1269 /* common.h in Headers */,
			);
			runOnlyForDeploymentPostprocessing = 0;
		};
		4B3D23731337FBC800DD29B8 /* Headers */ = {
			isa = PBXHeadersBuildPhase;
			buildActionMask = 2147483647;
2829
2830
2831
2832
2833
2834
2835

2836
2837
2838
2839
2840
2841
2842
				4BC176361D04963000C32718 /* OFTarArchiveEntry+Private.h in Headers */,
				4BD653C5143B8489006182F0 /* OFTCPSocket+SOCKS5.h in Headers */,
				4B6C8ADC17BD5C2E00B194F2 /* OFThread+Private.h in Headers */,
				4B6C8ADD17BD5C2E00B194F2 /* OFTimer+Private.h in Headers */,
				4B853CEB1EBFDEB000A4B2C4 /* OFXMLNode+Private.h in Headers */,
				4B6C8ADE17BD5C2E00B194F2 /* OFZIPArchiveEntry+Private.h in Headers */,
				4B7DD58218942FE200990FD6 /* socket_helpers.h in Headers */,

				4BFC37BD1E50E11C00EE1269 /* common.h in Headers */,
			);
			runOnlyForDeploymentPostprocessing = 0;
		};
		4B5D70711DA2F87A00B3B2D7 /* Headers */ = {
			isa = PBXHeadersBuildPhase;
			buildActionMask = 2147483647;







>







2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
				4BC176361D04963000C32718 /* OFTarArchiveEntry+Private.h in Headers */,
				4BD653C5143B8489006182F0 /* OFTCPSocket+SOCKS5.h in Headers */,
				4B6C8ADC17BD5C2E00B194F2 /* OFThread+Private.h in Headers */,
				4B6C8ADD17BD5C2E00B194F2 /* OFTimer+Private.h in Headers */,
				4B853CEB1EBFDEB000A4B2C4 /* OFXMLNode+Private.h in Headers */,
				4B6C8ADE17BD5C2E00B194F2 /* OFZIPArchiveEntry+Private.h in Headers */,
				4B7DD58218942FE200990FD6 /* socket_helpers.h in Headers */,
				4BCE4EC41ED98D1400502FF0 /* unistd_wrapper.h in Headers */,
				4BFC37BD1E50E11C00EE1269 /* common.h in Headers */,
			);
			runOnlyForDeploymentPostprocessing = 0;
		};
		4B5D70711DA2F87A00B3B2D7 /* Headers */ = {
			isa = PBXHeadersBuildPhase;
			buildActionMask = 2147483647;

Modified configure.ac from [d691fbf5a5] to [49783a723d].

1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
			AC_SUBST(OBJFW_BRIDGE_STATIC_LIB, "libobjfw-bridge.a")
		])
	])
])

dnl This needs to be after all other header checks, as they include unistd.h,
dnl which in old glibc versions uses __block. This is worked around in the code
dnl by undefining __USE_XOPEN.
AC_MSG_CHECKING(whether Objective C compiler supports blocks)
old_OBJCFLAGS="$OBJCFLAGS"
OBJCFLAGS="$OBJCFLAGS -fblocks"
AC_TRY_COMPILE([], [
	int (^foo)(int bar);
	foo = ^ (int bar) { return 0; }
], [







|







1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
			AC_SUBST(OBJFW_BRIDGE_STATIC_LIB, "libobjfw-bridge.a")
		])
	])
])

dnl This needs to be after all other header checks, as they include unistd.h,
dnl which in old glibc versions uses __block. This is worked around in the code
dnl by providing a wrapper for unistd.h which takes care of this.
AC_MSG_CHECKING(whether Objective C compiler supports blocks)
old_OBJCFLAGS="$OBJCFLAGS"
OBJCFLAGS="$OBJCFLAGS -fblocks"
AC_TRY_COMPILE([], [
	int (^foo)(int bar);
	foo = ^ (int bar) { return 0; }
], [

Modified src/OFApplication.m from [e9758a10ed] to [531f6aaa25].

19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

#include <errno.h>
#include <signal.h>

#ifdef HAVE_UNISTD_H
# ifdef __GLIBC__
#  undef __USE_XOPEN	/* Needed to avoid old glibc using __block */
# endif
# include <unistd.h>
# ifdef __GLIBC__
#  define __USE_XOPEN 1
# endif
#endif

#import "OFApplication.h"
#import "OFString.h"
#import "OFArray.h"
#import "OFDictionary.h"
#import "OFLocalization.h"
#import "OFRunLoop.h"







<
<
<
<
|
<
<
<
<







19
20
21
22
23
24
25




26




27
28
29
30
31
32
33
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

#include <errno.h>
#include <signal.h>





#include "unistd_wrapper.h"





#import "OFApplication.h"
#import "OFString.h"
#import "OFArray.h"
#import "OFDictionary.h"
#import "OFLocalization.h"
#import "OFRunLoop.h"

Modified src/OFFile.m from [cf06285f59] to [20677504a4].

17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
#include "config.h"

#include <errno.h>

#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif
#ifdef HAVE_UNISTD_H
# ifdef __GLIBC__
#  undef __USE_XOPEN	/* Needed to avoid old glibc using __block */
# endif
# include <unistd.h>
# ifdef __GLIBC__
#  define __USE_XOPEN 1
# endif
#endif

#include "platform.h"

#ifdef OF_WII
# define BOOL OGC_BOOL
# include <fat.h>
# undef BOOL







<
<
<
<
|
<
<
<
<







17
18
19
20
21
22
23




24




25
26
27
28
29
30
31
#include "config.h"

#include <errno.h>

#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif




#include "unistd_wrapper.h"





#include "platform.h"

#ifdef OF_WII
# define BOOL OGC_BOOL
# include <fat.h>
# undef BOOL

Modified src/OFFileManager.m from [a094a79fd3] to [6281bc6839].

17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
#include "config.h"

#include <errno.h>

#ifdef HAVE_DIRENT_H
# include <dirent.h>
#endif
#ifdef HAVE_UNISTD_H
# ifdef __GLIBC__
#  undef __USE_XOPEN	/* Needed to avoid old glibc using __block */
# endif
# include <unistd.h>
# ifdef __GLIBC__
#  define __USE_XOPEN 1
# endif
#endif

#ifdef HAVE_PWD_H
# include <pwd.h>
#endif
#ifdef HAVE_GRP_H
# include <grp.h>
#endif







<
<
<
<
|
<
<
<
<







17
18
19
20
21
22
23




24




25
26
27
28
29
30
31
#include "config.h"

#include <errno.h>

#ifdef HAVE_DIRENT_H
# include <dirent.h>
#endif




#include "unistd_wrapper.h"





#ifdef HAVE_PWD_H
# include <pwd.h>
#endif
#ifdef HAVE_GRP_H
# include <grp.h>
#endif

Modified src/OFKernelEventObserver_epoll.m from [80e980fa67] to [72b75e858f].

18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40

#include <assert.h>
#include <errno.h>

#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif
#ifdef HAVE_UNISTD_H
# ifdef __GLIBC__
#  undef __USE_XOPEN	/* Needed to avoid old glibc using __block */
# endif
# include <unistd.h>
# ifdef __GLIBC__
#  define __USE_XOPEN 1
# endif
#endif

#include <sys/epoll.h>

#import "OFKernelEventObserver.h"
#import "OFKernelEventObserver+Private.h"
#import "OFKernelEventObserver_epoll.h"
#import "OFArray.h"







<
<
<
<
|
<
<
<
<







18
19
20
21
22
23
24




25




26
27
28
29
30
31
32

#include <assert.h>
#include <errno.h>

#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif




#include "unistd_wrapper.h"





#include <sys/epoll.h>

#import "OFKernelEventObserver.h"
#import "OFKernelEventObserver+Private.h"
#import "OFKernelEventObserver_epoll.h"
#import "OFArray.h"

Modified src/OFKernelEventObserver_kqueue.m from [06b782a930] to [5d1e3ad7ed].

19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
#include <assert.h>
#include <errno.h>
#include <math.h>

#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif

#include <sys/types.h>
#include <sys/event.h>
#include <sys/time.h>

#import "OFKernelEventObserver.h"
#import "OFKernelEventObserver+Private.h"







<
|
<







19
20
21
22
23
24
25

26

27
28
29
30
31
32
33
#include <assert.h>
#include <errno.h>
#include <math.h>

#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif

#include "unistd_wrapper.h"


#include <sys/types.h>
#include <sys/event.h>
#include <sys/time.h>

#import "OFKernelEventObserver.h"
#import "OFKernelEventObserver+Private.h"

Modified src/OFProcess.m from [4c6eb1f07f] to [5a7b7eae60].

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
#include "config.h"

#include <errno.h>
#include <string.h>

#include <signal.h>

#ifdef HAVE_UNISTD_H
# ifdef __GLIBC__
#  undef __USE_XOPEN	/* Needed to avoid old glibc using __block */
# endif
# include <unistd.h>
# ifdef __GLIBC__
#  define __USE_XOPEN 1
# endif
#endif

#ifdef HAVE_SYS_WAIT_H
# include <sys/wait.h>
#endif


#ifdef HAVE_SPAWN_H
# include <spawn.h>
#endif

#import "OFProcess.h"
#import "OFString.h"
#import "OFArray.h"







<
<
<
<
<
<
<
<
<
<




>







17
18
19
20
21
22
23










24
25
26
27
28
29
30
31
32
33
34
35
#include "config.h"

#include <errno.h>
#include <string.h>

#include <signal.h>











#ifdef HAVE_SYS_WAIT_H
# include <sys/wait.h>
#endif

#include "unistd_wrapper.h"
#ifdef HAVE_SPAWN_H
# include <spawn.h>
#endif

#import "OFProcess.h"
#import "OFString.h"
#import "OFArray.h"

Modified src/OFStdIOStream.m from [f40b730d75] to [cecae3f90d].

14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
 * file.
 */

#include "config.h"

#include <errno.h>

#ifdef HAVE_UNISTD_H
# ifdef __GLIBC__
#  undef __USE_XOPEN	/* Needed to avoid old glibc using __block */
# endif
# include <unistd.h>
# ifdef __GLIBC__
#  define __USE_XOPEN 1
# endif
#endif

#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
#endif
#ifdef HAVE_SYS_TTYCOM_H
# include <sys/ttycom.h>
#endif







<
<
<
<
|
<
<
<
<







14
15
16
17
18
19
20




21




22
23
24
25
26
27
28
 * file.
 */

#include "config.h"

#include <errno.h>





#include "unistd_wrapper.h"





#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
#endif
#ifdef HAVE_SYS_TTYCOM_H
# include <sys/ttycom.h>
#endif

Modified src/OFSystemInfo.m from [7e09138521] to [163a46eba3].

16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38

#define __NO_EXT_QNX

#include "config.h"

#include <stdlib.h>	/* include any libc header to get the libc defines */

#ifdef HAVE_UNISTD_H
# ifdef __GLIBC__
#  undef __USE_XOPEN	/* Needed to avoid old glibc using __block */
# endif
# include <unistd.h>
# ifdef __GLIBC__
#  define __USE_XOPEN 1
# endif
#endif

#include "platform.h"

#ifdef OF_MACOS
# include <sys/sysctl.h>
#endif








<
<
<
<
|
<
<
<
<







16
17
18
19
20
21
22




23




24
25
26
27
28
29
30

#define __NO_EXT_QNX

#include "config.h"

#include <stdlib.h>	/* include any libc header to get the libc defines */





#include "unistd_wrapper.h"





#include "platform.h"

#ifdef OF_MACOS
# include <sys/sysctl.h>
#endif

Modified src/OFThread.m from [642d2b4756] to [9edbd0db22].

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

#include "config.h"

#include <stdlib.h>
#include <math.h>
#include <time.h>

#ifdef HAVE_UNISTD_H
# ifdef __GLIBC__
#  undef __USE_XOPEN	/* Needed to avoid old glibc using __block */
# endif
# include <unistd.h>
# ifdef __GLIBC__
#  define __USE_XOPEN 1
# endif
#endif

#ifdef OF_HAVE_SCHED_YIELD
# include <sched.h>
#endif


#include "platform.h"

#ifdef OF_WII
# define BOOL OGC_BOOL
# define nanosleep ogc_nanosleep
# include <ogcsys.h>







<
<
<
<
<
<
<
<
<
<



>







20
21
22
23
24
25
26










27
28
29
30
31
32
33
34
35
36
37

#include "config.h"

#include <stdlib.h>
#include <math.h>
#include <time.h>











#ifdef OF_HAVE_SCHED_YIELD
# include <sched.h>
#endif
#include "unistd_wrapper.h"

#include "platform.h"

#ifdef OF_WII
# define BOOL OGC_BOOL
# define nanosleep ogc_nanosleep
# include <ogcsys.h>

Modified src/socket_helpers.h from [4619bdb896] to [7463dbdf6e].

12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
 * 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"

#include <stdlib.h>	/* include any libc header to get the libc defines */

#ifdef HAVE_UNISTD_H
# ifdef __GLIBC__
#  undef __USE_XOPEN	/* Needed to avoid old glibc using __block */
# endif
# include <unistd.h>
# ifdef __GLIBC__
#  define __USE_XOPEN 1
# endif
#endif

#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_NETDB_H
# include <netdb.h>
#endif







<
<
<
<
<
<
|
<
<
<
<







12
13
14
15
16
17
18






19




20
21
22
23
24
25
26
 * 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"







#include "unistd_wrapper.h"





#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_NETDB_H
# include <netdb.h>
#endif

Added src/unistd_wrapper.h version [535661bb55].

























































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
/*
 * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017
 *   Jonathan Schleifer <js@heap.zone> *
 * All rights reserved.
 *
 * This file is part of ObjFW. It may be distributed under the terms of the
 * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
 * 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 "config.h"

#include <stdlib.h>	/* Make sure we have any libc include */

#ifdef HAVE_UNISTD_H
# ifdef __GLIBC__
#  undef __USE_XOPEN	/* Needed to avoid old glibc using __block */
# endif
# include <unistd.h>
# ifdef __GLIBC__
#  define __USE_XOPEN 1
# endif
#endif