Skip to content

Commit 40bf583

Browse files
compnerdcompnerd
committed
protect unistd.h inclusion with a check for Unix
This ensures that all the inclusions of unistd.h inclusion are protected with the check that the header exists. This header is only available on unix like environments to define the standard of compliance. This protection is needed for other environments like Windows.
1 parent b5ec5d8 commit 40bf583

34 files changed

+61
-7
lines changed

‎CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ check_include_files("strings.h" HAVE_STRINGS_H)
221221
check_include_files("sys/guarded.h" HAVE_SYS_GUARDED_H)
222222
check_include_files("sys/stat.h" HAVE_SYS_STAT_H)
223223
check_include_files("sys/types.h" HAVE_SYS_TYPES_H)
224-
check_include_files("unistd.h" HAVE_UNISTD_H)
225224
check_include_files("objc/objc-internal.h" HAVE_OBJC)
226225

227226
if(HAVE_MACH)

‎cmake/config.h.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,6 @@
192192
/* Define to 1 if you have the <TargetConditionals.h> header file. */
193193
#cmakedefine HAVE_TARGETCONDITIONALS_H
194194

195-
/* Define to 1 if you have the <unistd.h> header file. */
196-
#cmakedefine01 HAVE_UNISTD_H
197-
198195
/* Define to 1 if you have the `_pthread_workqueue_init' function. */
199196
#cmakedefine HAVE__PTHREAD_WORKQUEUE_INIT
200197

‎dispatch/dispatch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include <stdint.h>
3636
#include <stdbool.h>
3737
#include <stdarg.h>
38-
#if !defined(HAVE_UNISTD_H) || HAVE_UNISTD_H
38+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
3939
#include <unistd.h>
4040
#endif
4141
#include <fcntl.h>

‎private/private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#include <mach/mach.h>
4242
#include <mach/message.h>
4343
#endif
44-
#if HAVE_UNISTD_H
44+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
4545
#include <unistd.h>
4646
#endif
4747
#include <pthread.h>

‎src/internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ DISPATCH_EXPORT DISPATCH_NOTHROW void dispatch_atfork_child(void);
285285
#include <stdio.h>
286286
#include <stdlib.h>
287287
#include <string.h>
288-
#if HAVE_UNISTD_H
288+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
289289
#include <unistd.h>
290290
#endif
291291

‎src/queue.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,9 @@ libdispatch_init(void)
903903
}
904904

905905
#if DISPATCH_USE_THREAD_LOCAL_STORAGE
906+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
906907
#include <unistd.h>
908+
#endif
907909
#include <sys/syscall.h>
908910

909911
#ifndef __ANDROID__

‎tests/Foundation/bench.mm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@
3131
#include <stdlib.h>
3232
#include <stdint.h>
3333
#include <stdbool.h>
34+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
3435
#include <unistd.h>
36+
#endif
3537
#include <assert.h>
3638
#include <errno.h>
3739
#include <pthread.h>

‎tests/bsdtestharness.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
#include <spawn.h>
2424
#include <stdio.h>
2525
#include <stdlib.h>
26+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2627
#include <unistd.h>
28+
#endif
2729
#include <signal.h>
2830
#ifdef __APPLE__
2931
#include <mach/clock_types.h>

‎tests/bsdtests.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
#include <stdarg.h>
2626
#include <stdio.h>
2727
#include <stdlib.h>
28+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2829
#include <unistd.h>
30+
#endif
2931
#include <errno.h>
3032
#include <sys/errno.h>
3133
#include <sys/wait.h>

‎tests/bsdtests.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@
4141
#include <CoreFoundation/CoreFoundation.h>
4242
#endif
4343

44+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
4445
#include <unistd.h>
46+
#endif
4547
#include <string.h>
4648
#include <stdint.h>
4749

‎tests/cffd.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222

2323
#include <stdio.h>
2424
#include <stdlib.h>
25+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2526
#include <unistd.h>
27+
#endif
2628
#include <string.h>
2729
#include <sys/param.h>
2830
#include <sys/ucred.h>

‎tests/dispatch_after.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020

2121
#include <dispatch/dispatch.h>
2222
#include <stdio.h>
23+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2324
#include <unistd.h>
25+
#endif
2426
#include <stdlib.h>
2527
#include <assert.h>
2628
#ifdef __APPLE__

‎tests/dispatch_apply.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020

2121
#include <dispatch/dispatch.h>
2222
#include <stdio.h>
23+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2324
#include <unistd.h>
25+
#endif
2426
#include <stdlib.h>
2527
#include <assert.h>
2628
#ifdef __APPLE__

‎tests/dispatch_cascade.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020

2121
#include <stdio.h>
2222
#include <dispatch/dispatch.h>
23+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2324
#include <unistd.h>
25+
#endif
2426
#include <stdlib.h>
2527

2628
#include <bsdtests.h>

‎tests/dispatch_concur.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020

2121
#include <dispatch/dispatch.h>
2222
#include <dispatch/private.h>
23+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2324
#include <unistd.h>
25+
#endif
2426
#include <stdlib.h>
2527
#include <stdio.h>
2628
#include <sys/types.h>

‎tests/dispatch_context_for_key.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
#include <dispatch/dispatch.h>
2222
#include <stdlib.h>
2323
#include <stdio.h>
24+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2425
#include <unistd.h>
26+
#endif
2527
#include <assert.h>
2628

2729
#include <bsdtests.h>

‎tests/dispatch_deadname.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
#include <mach/mach.h>
2525
#endif
2626
#include <stdio.h>
27+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2728
#include <unistd.h>
29+
#endif
2830
#include <stdlib.h>
2931
#include <assert.h>
3032

‎tests/dispatch_drift.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
#endif
2424
#include <dispatch/dispatch.h>
2525
#include <sys/time.h>
26+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2627
#include <unistd.h>
28+
#endif
2729
#include <stdio.h>
2830
#include <stdlib.h>
2931
#ifdef __APPLE__

‎tests/dispatch_group.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
*/
2020

2121
#include <dispatch/dispatch.h>
22+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2223
#include <unistd.h>
24+
#endif
2325
#include <stdarg.h>
2426
#include <stdio.h>
2527
#include <stdlib.h>

‎tests/dispatch_io.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
#include <fcntl.h>
2626
#include <stdio.h>
2727
#include <stdlib.h>
28+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2829
#include <unistd.h>
30+
#endif
2931
#include <errno.h>
3032
#include <fts.h>
3133
#ifdef __APPLE__

‎tests/dispatch_io_net.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020

2121
#include <stdio.h>
2222
#include <stdlib.h>
23+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2324
#include <unistd.h>
25+
#endif
2426
#include <errno.h>
2527
#include <netdb.h>
2628
#include <sys/types.h>

‎tests/dispatch_overcommit.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
#include <dispatch/dispatch.h>
2626
#include <dispatch/private.h>
2727
#include <stdio.h>
28+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2829
#include <unistd.h>
30+
#endif
2931
#include <stdlib.h>
3032
#include <assert.h>
3133
#ifdef __APPLE__

‎tests/dispatch_priority.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
#include <stdio.h>
2222
#include <dispatch/dispatch.h>
2323
#include <dispatch/private.h>
24+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2425
#include <unistd.h>
26+
#endif
2527
#include <stdlib.h>
2628
#include <assert.h>
2729
#ifdef __APPLE__

‎tests/dispatch_proc.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020

2121
#include <dispatch/dispatch.h>
2222
#include <stdio.h>
23+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2324
#include <unistd.h>
25+
#endif
2426
#include <stdlib.h>
2527
#include <assert.h>
2628
#include <spawn.h>

‎tests/dispatch_queue_finalizer.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
*/
2020

2121
#include <dispatch/dispatch.h>
22+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2223
#include <unistd.h>
24+
#endif
2325
#include <stdarg.h>
2426
#include <stdio.h>
2527
#include <stdlib.h>

‎tests/dispatch_read.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
#include <fcntl.h>
2525
#include <stdio.h>
2626
#include <stdlib.h>
27+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2728
#include <unistd.h>
29+
#endif
2830
#include <errno.h>
2931

3032
#include <dispatch/dispatch.h>

‎tests/dispatch_read2.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
#include <fcntl.h>
2626
#include <stdio.h>
2727
#include <stdlib.h>
28+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2829
#include <unistd.h>
30+
#endif
2931
#include <errno.h>
3032
#include <fts.h>
3133
#ifdef __APPLE__

‎tests/dispatch_readsync.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
#include <dispatch/dispatch.h>
2222
#include <dispatch/private.h>
2323
#include <stdlib.h>
24+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2425
#include <unistd.h>
26+
#endif
2527
#ifdef __ANDROID__
2628
#include <linux/sysctl.h>
2729
#else

‎tests/dispatch_select.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
#include <stdio.h>
2222
#include <fcntl.h>
2323
#include <stdlib.h>
24+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2425
#include <unistd.h>
26+
#endif
2527
#include <sys/stat.h>
2628
#include <dispatch/dispatch.h>
2729

‎tests/dispatch_sema.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
*/
2020

2121
#include <dispatch/dispatch.h>
22+
#if !USE_WIN32_SEM
2223
#include <pthread.h>
24+
#endif
2325
#include <stdio.h>
2426
#include <assert.h>
2527

‎tests/dispatch_sync_on_main.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
#include <dispatch/private.h>
2323
#include <stdlib.h>
2424
#include <stdio.h>
25+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2526
#include <unistd.h>
27+
#endif
2628
#include <CoreFoundation/CoreFoundation.h>
2729

2830
#include <bsdtests.h>

‎tests/dispatch_test.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727

2828
#include <stdlib.h>
2929
#include <stdio.h>
30+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
3031
#include <unistd.h>
32+
#endif
3133
#if __has_include(<sys/event.h>)
3234
#define HAS_SYS_EVENT_H 1
3335
#include <sys/event.h>

‎tests/dispatch_vm.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
#include <sys/event.h>
2222
#include <stdio.h>
2323
#include <stdlib.h>
24+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2425
#include <unistd.h>
26+
#endif
2527
#ifdef __APPLE__
2628
#include <libkern/OSAtomic.h>
2729
#endif

‎tests/dispatch_vnode.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
#include <stdio.h>
2222
#include <fcntl.h>
2323
#include <stdlib.h>
24+
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
2425
#include <unistd.h>
26+
#endif
2527

2628
#include <dispatch/dispatch.h>
2729

0 commit comments

Comments
 (0)