ObjFW  Check-in [1287e77e04]

Overview
Comment:Make includes of unistd.h and fcntl.h conditional
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 1287e77e04b62f04c44eddd5ae1e892f8bac2c03e38f882d0ebf021f17614073
User & Date: js on 2017-05-22 23:31:26
Other Links: manifest | tags
Context
2017-05-25
15:09
-[OFMutableDictionary addEntiresFromDictionary:] check-in: 88a584a16f user: js tags: trunk
2017-05-22
23:31
Make includes of unistd.h and fcntl.h conditional check-in: 1287e77e04 user: js tags: trunk
22:00
Omit check for select() / poll() on certain OSes check-in: f81f162b33 user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified configure.ac from [fadaf984e1] to [2d6f795b86].

︙
935
936
937
938
939
940
941
942

943
944
945
946
947
948
949

935
936
937
938
939
940
941

942
943
944
945
946
947
948
949








-
+








		AC_DEFINE(HAVE_READDIR_R, 1, [Whether we have readdir_r()])
	], [
		AC_MSG_RESULT(no)
	])
	OBJCFLAGS="$old_OBJCFLAGS"
])

AC_CHECK_HEADERS(fcntl.h)
AC_CHECK_HEADERS(fcntl.h dirent.h)
AC_CHECK_FUNCS([sysconf gmtime_r localtime_r nanosleep fcntl])

AC_CHECK_HEADERS(xlocale.h)
AC_CHECK_FUNCS([strtod_l strtof_l asprintf_l])

AC_CHECK_FUNC(pipe, [
	AC_DEFINE(OF_HAVE_PIPE, 1, [Whether we have pipe()])
︙

Modified src/OFApplication.m from [e40754826f] to [4dabbbf60b].

︙
18
19
20
21
22
23
24


25


26
27
28
29
30
31
32

18
19
20
21
22
23
24
25
26

27
28
29
30
31
32
33
34
35








+
+
-
+
+









#include <stdio.h>
#include <stdlib.h>
#include <string.h>

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

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

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

Modified src/OFFile.m from [018b6789b8] to [867ccc3495].

︙
14
15
16
17
18
19
20

21
22





23
24
25
26
27
28
29

14
15
16
17
18
19
20
21


22
23
24
25
26
27
28
29
30
31
32
33








+
-
-
+
+
+
+
+








 * file.
 */

#include "config.h"

#include <errno.h>

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

#include "platform.h"

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

Modified src/OFFileManager.m from [54d3223c13] to [6850bf008a].

︙
14
15
16
17
18
19
20

21
22





23
24
25
26
27
28
29

14
15
16
17
18
19
20
21


22
23
24
25
26
27
28
29
30
31
32
33








+
-
-
+
+
+
+
+








 * file.
 */

#include "config.h"

#include <errno.h>

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

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

Modified src/OFKernelEventObserver_epoll.m from [e75e01d402] to [5e58174b96].

︙
15
16
17
18
19
20
21

22
23





24
25
26
27
28
29
30

15
16
17
18
19
20
21
22


23
24
25
26
27
28
29
30
31
32
33
34








+
-
-
+
+
+
+
+








 */

#include "config.h"

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

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

#include <sys/epoll.h>

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

Modified src/OFKernelEventObserver_kqueue.m from [4a787d392f] to [06b782a930].

︙
16
17
18
19
20
21
22

23
24





25
26
27
28
29
30
31

16
17
18
19
20
21
22
23


24
25
26
27
28
29
30
31
32
33
34
35








+
-
-
+
+
+
+
+









#include "config.h"

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

#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#include <unistd.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"
︙

Modified src/OFProcess.m from [57b3b6c720] to [c5ef32205f].

︙
22
23
24
25
26
27
28

29


30

31


32
33
34
35
36
37
38

22
23
24
25
26
27
28
29

30
31
32
33

34
35
36
37
38
39
40
41
42








+
-
+
+

+
-
+
+








/* Work around __block being used by glibc */
#ifdef __GLIBC__
# undef __USE_XOPEN
#endif

#include "platform.h"

#include <signal.h>
#ifndef OF_WINDOWS

#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
# include <signal.h>

#ifndef OF_WINDOWS
# include <sys/wait.h>
#endif

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

Modified src/OFStdIOStream.m from [d6e666357c] to [2c73c952bc].

︙
19
20
21
22
23
24
25


26


27
28
29
30
31
32
33

19
20
21
22
23
24
25
26
27

28
29
30
31
32
33
34
35
36








+
+
-
+
+








/* Work around __block being used by glibc */
#include <stdlib.h>	/* include any libc header to get the libc defines */
#ifdef __GLIBC__
# undef __USE_XOPEN
#endif

#include <errno.h>

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

#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 [83b5606b17] to [bfa2f21764].

︙
20
21
22
23
24
25
26

27


28
29
30
31
32
33
34

20
21
22
23
24
25
26
27

28
29
30
31
32
33
34
35
36








+
-
+
+









/* Work around __block being used by glibc */
#include <stdlib.h>	/* include any libc header to get the libc defines */
#ifdef __GLIBC__
# undef __USE_XOPEN
#endif

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

#include "platform.h"

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

Modified src/OFTCPSocket.m from [16f6a959b9] to [56b097e84a].

︙
21
22
23
24
25
26
27

28


29
30
31
32
33
34
35

21
22
23
24
25
26
27
28

29
30
31
32
33
34
35
36
37








+
-
+
+









#include <assert.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

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

#import "OFTCPSocket.h"
#import "OFTCPSocket+SOCKS5.h"
#import "OFString.h"
#import "OFThread.h"
#import "OFTimer.h"
#import "OFRunLoop.h"
︙

Modified src/OFThread.m from [b1f565231d] to [0372a1b765].

︙
27
28
29
30
31
32
33
34

35
36
37
38
39
40
41

27
28
29
30
31
32
33

34
35
36
37
38
39
40
41








-
+








/* Work around __block being used by glibc */
#ifdef __GLIBC__
# undef __USE_XOPEN
#endif

#include "platform.h"

#ifndef OF_WINDOWS
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif

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

Modified src/OFUDPSocket.m from [83754f70d8] to [a9d215ce51].

︙
16
17
18
19
20
21
22

23


24
25
26
27
28
29
30

16
17
18
19
20
21
22
23

24
25
26
27
28
29
30
31
32








+
-
+
+









#include "config.h"

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

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

#import "OFUDPSocket.h"
#ifdef OF_HAVE_THREADS
# import "OFThread.h"
#endif
#import "OFRunLoop.h"
#import "OFRunLoop+Private.h"
︙

Modified src/socket_helpers.h from [77b020019f] to [8ff5d2ca5e].

︙
17
18
19
20
21
22
23

24


25
26
27
28
29
30
31

17
18
19
20
21
22
23
24

25
26
27
28
29
30
31
32
33








+
-
+
+








#include "config.h"

/* Work around __block being used by glibc */
#ifdef __GLIBC__
# undef __USE_XOPEN
#endif

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

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

Fossil 2.23 [47362306a7] 2023-11-01 18:56:47
This page was generated in about 0.048s