>From 2ffa18f1cb4322246c083f3b8fe8202fe4dfe466 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <bonzini@gnu.org>
Date: Tue, 8 Jun 2010 10:01:19 +0200
Subject: [PATCH 1/2] move system file inclusions to src/private.h and testing/system.h

---
 src/internal.h                    |   60 -------------------------------------
 src/private.h                     |   57 +++++++++++++++++++++++++++++++++++
 testing/bench.mm                  |   14 +--------
 testing/dispatch_after.c          |    5 +--
 testing/dispatch_api.c            |    4 +--
 testing/dispatch_apply.c          |    7 +----
 testing/dispatch_c99.c            |    3 +-
 testing/dispatch_cascade.c        |    5 +--
 testing/dispatch_cffd.c           |   15 +--------
 testing/dispatch_debug.c          |    6 +---
 testing/dispatch_drift.c          |    6 +---
 testing/dispatch_group.c          |    7 +----
 testing/dispatch_pingpong.c       |    3 +-
 testing/dispatch_priority.c       |    6 +---
 testing/dispatch_proc.c           |    7 +----
 testing/dispatch_read.c           |    8 +----
 testing/dispatch_readsync.c       |    7 +----
 testing/dispatch_sema.c           |    5 +--
 testing/dispatch_starfish.c       |    4 +--
 testing/dispatch_test.c           |   10 +-----
 testing/dispatch_timer_bit31.c    |    7 +----
 testing/dispatch_timer_bit63.c    |    7 +----
 testing/dispatch_timer_set_time.c |    6 +---
 testing/fd_stress.c               |   11 +------
 testing/harness.c                 |    7 +----
 testing/queue_finalizer.c         |    8 +----
 testing/summarize.c               |    5 +--
 testing/system.h                  |   47 +++++++++++++++++++++++++++++
 28 files changed, 129 insertions(+), 208 deletions(-)
 create mode 100644 testing/system.h

diff --git a/src/internal.h b/src/internal.h
index c72e827..1789bc9 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -60,66 +60,6 @@
 #endif
 
 
-#if HAVE_LIBKERN_OSCROSSENDIAN_H
-#include <libkern/OSCrossEndian.h>
-#endif
-#if HAVE_LIBKERN_OSATOMIC_H
-#include <libkern/OSAtomic.h>
-#endif
-#if HAVE_MACH
-#include <mach/boolean.h>
-#include <mach/clock_types.h>
-#include <mach/clock.h>
-#include <mach/exception.h>
-#include <mach/mach.h>
-#include <mach/mach_error.h>
-#include <mach/mach_host.h>
-#include <mach/mach_interface.h>
-#include <mach/mach_time.h>
-#include <mach/mach_traps.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/host_info.h>
-#include <mach/notify.h>
-#endif /* HAVE_MACH */
-#if HAVE_MALLOC_MALLOC_H
-#include <malloc/malloc.h>
-#endif
-#include <sys/mount.h>
-#include <sys/queue.h>
-#include <sys/stat.h>
-#if HAVE_SYS_SYSCTL_H
-#include <sys/sysctl.h>
-#endif
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-
-#ifdef __BLOCKS__
-#include <Block_private.h>
-#include <Block.h>
-#endif /* __BLOCKS__ */
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <search.h>
-#if USE_POSIX_SEM
-#include <semaphore.h>
-#endif
-#include <signal.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #define DISPATCH_NOINLINE	__attribute__((noinline))
 
 // workaround 6368156
diff --git a/src/private.h b/src/private.h
index dcdf968..17875e2 100644
--- a/src/private.h
+++ b/src/private.h
@@ -40,6 +40,63 @@
 #endif
 #include <pthread.h>
 
+#if HAVE_LIBKERN_OSCROSSENDIAN_H
+#include <libkern/OSCrossEndian.h>
+#endif
+#if HAVE_LIBKERN_OSATOMIC_H
+#include <libkern/OSAtomic.h>
+#endif
+#if HAVE_MACH
+#include <mach/boolean.h>
+#include <mach/clock_types.h>
+#include <mach/clock.h>
+#include <mach/exception.h>
+#include <mach/mach.h>
+#include <mach/mach_error.h>
+#include <mach/mach_host.h>
+#include <mach/mach_interface.h>
+#include <mach/mach_time.h>
+#include <mach/mach_traps.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/host_info.h>
+#include <mach/notify.h>
+#endif /* HAVE_MACH */
+#if HAVE_MALLOC_MALLOC_H
+#include <malloc/malloc.h>
+#endif
+#include <sys/mount.h>
+#include <sys/queue.h>
+#include <sys/stat.h>
+#if HAVE_SYS_SYSCTL_H
+#include <sys/sysctl.h>
+#endif
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <netinet/in.h>
+
+#ifdef __BLOCKS__
+#include <Block_private.h>
+#include <Block.h>
+#endif /* __BLOCKS__ */
+
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <search.h>
+#if USE_POSIX_SEM
+#include <semaphore.h>
+#endif
+#include <signal.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+
 #ifndef __DISPATCH_BUILDING_DISPATCH__
 #include_next <dispatch/dispatch.h>
 
diff --git a/testing/bench.mm b/testing/bench.mm
index bb34671..c6d24a0 100644
--- a/testing/bench.mm
+++ b/testing/bench.mm
@@ -20,21 +20,9 @@
 
 #include <Foundation/Foundation.h>
 #include <libkern/OSAtomic.h>
-#include <sys/sysctl.h>
 #include <mach/mach.h>
 #include <mach/mach_time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <unistd.h>
-#include <assert.h>
-#include <errno.h>
-#include <pthread.h>
-#include <math.h>
-#ifdef __BLOCKS__
-#include <Block.h>
-#endif
+#include "system.h"
 #include <dispatch/dispatch.h>
 #include <dispatch/private.h>
 
diff --git a/testing/dispatch_after.c b/testing/dispatch_after.c
index c8b0f3f..f706401 100644
--- a/testing/dispatch_after.c
+++ b/testing/dispatch_after.c
@@ -20,11 +20,8 @@
 
 #include "config/config.h"
 
+#include "system.h"
 #include <dispatch/dispatch.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <assert.h>
 
 #include "dispatch_test.h"
 #include <Block.h>
diff --git a/testing/dispatch_api.c b/testing/dispatch_api.c
index 77b7f96..cc33972 100644
--- a/testing/dispatch_api.c
+++ b/testing/dispatch_api.c
@@ -20,10 +20,8 @@
 
 #include "config/config.h"
 
-#include <stdlib.h>
-
+#include "system.h"
 #include <dispatch/dispatch.h>
-
 #include "dispatch_test.h"
 
 void
diff --git a/testing/dispatch_apply.c b/testing/dispatch_apply.c
index 45c5f17..ad26594 100644
--- a/testing/dispatch_apply.c
+++ b/testing/dispatch_apply.c
@@ -22,12 +22,7 @@
 
 #include <dispatch/dispatch.h>
 #include "src/hw_shims.h"
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <assert.h>
-
+#include "system.h"
 #include "dispatch_test.h"
 
 int
diff --git a/testing/dispatch_c99.c b/testing/dispatch_c99.c
index 4ab43cc..e2dbcdb 100644
--- a/testing/dispatch_c99.c
+++ b/testing/dispatch_c99.c
@@ -21,8 +21,7 @@
 #include "config/config.h"
 
 #include <dispatch/dispatch.h>
-#include <stdlib.h>
-
+#include "system.h"
 #include "dispatch_test.h"
 
 void
diff --git a/testing/dispatch_cascade.c b/testing/dispatch_cascade.c
index 91eecfb..d21c7f9 100644
--- a/testing/dispatch_cascade.c
+++ b/testing/dispatch_cascade.c
@@ -20,11 +20,8 @@
 
 #include "config/config.h"
 
-#include <stdio.h>
 #include <dispatch/dispatch.h>
-#include <unistd.h>
-#include <stdlib.h>
-
+#include "system.h"
 #include "dispatch_test.h"
 
 int done = 0;
diff --git a/testing/dispatch_cffd.c b/testing/dispatch_cffd.c
index 3b46fc9..4758f2a 100644
--- a/testing/dispatch_cffd.c
+++ b/testing/dispatch_cffd.c
@@ -21,20 +21,7 @@
 #include "config/config.h"
 
 #include <dispatch/dispatch.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/ucred.h>
-#include <sys/mount.h>
-#include <sys/queue.h>
-#include <sys/errno.h>
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/time.h>
-
+#include "system.h"
 #include <CoreServices/CoreServices.h>
 
 #include "dispatch_test.h"
diff --git a/testing/dispatch_debug.c b/testing/dispatch_debug.c
index a0add94..e77d63e 100644
--- a/testing/dispatch_debug.c
+++ b/testing/dispatch_debug.c
@@ -20,12 +20,8 @@
 
 #include "config/config.h"
 
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
+#include "system.h"
 #include <dispatch/dispatch.h>
-
 #include "dispatch_test.h"
 
 int
diff --git a/testing/dispatch_drift.c b/testing/dispatch_drift.c
index 490e961..0f0d3c4 100644
--- a/testing/dispatch_drift.c
+++ b/testing/dispatch_drift.c
@@ -21,11 +21,7 @@
 #include "config/config.h"
 
 #include <dispatch/dispatch.h>
-#include <sys/time.h>
-#include <math.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include "system.h"
 #include "dispatch_test.h"
 
 //
diff --git a/testing/dispatch_group.c b/testing/dispatch_group.c
index 64e66d8..0ea0366 100644
--- a/testing/dispatch_group.c
+++ b/testing/dispatch_group.c
@@ -21,12 +21,7 @@
 #include "config/config.h"
 
 #include <dispatch/dispatch.h>
-#include <unistd.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-
+#include "system.h"
 #include "dispatch_test.h"
 
 #ifndef NSEC_PER_SEC
diff --git a/testing/dispatch_pingpong.c b/testing/dispatch_pingpong.c
index f999ecd..3c94255 100644
--- a/testing/dispatch_pingpong.c
+++ b/testing/dispatch_pingpong.c
@@ -21,8 +21,7 @@
 #include "config/config.h"
 
 #include <dispatch/dispatch.h>
-#include <stdio.h>
-
+#include "system.h"
 #include "dispatch_test.h"
 
 uint32_t count = 0;
diff --git a/testing/dispatch_priority.c b/testing/dispatch_priority.c
index 0034bfa..6876471 100644
--- a/testing/dispatch_priority.c
+++ b/testing/dispatch_priority.c
@@ -19,14 +19,10 @@
  */
 
 #include "config/config.h"
-
-#include <stdio.h>
 #include <dispatch/dispatch.h>
 #define	__DISPATCH_INDIRECT__
 #include "src/queue_private.h"
-#include <unistd.h>
-#include <stdlib.h>
-#include <assert.h>
+#include "system.h"
 #if HAVE_TARGETCONDITIONALS_H
 #include <TargetConditionals.h>
 #endif
diff --git a/testing/dispatch_proc.c b/testing/dispatch_proc.c
index 1764a65..cfce3e0 100644
--- a/testing/dispatch_proc.c
+++ b/testing/dispatch_proc.c
@@ -21,12 +21,7 @@
 #include "config/config.h"
 
 #include <dispatch/dispatch.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <spawn.h>
-#include <signal.h>
+#include "system.h"
 #include <libkern/OSAtomic.h>
 
 #include "dispatch_test.h"
diff --git a/testing/dispatch_read.c b/testing/dispatch_read.c
index 7d1a8e6..e32945b 100644
--- a/testing/dispatch_read.c
+++ b/testing/dispatch_read.c
@@ -21,13 +21,7 @@
 #include "config/config.h"
 
 #include <sys/stat.h>
-#include <assert.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-
+#include "system.h"
 #include <dispatch/dispatch.h>
 
 #include "dispatch_test.h"
diff --git a/testing/dispatch_readsync.c b/testing/dispatch_readsync.c
index 0b5facd..f0a584c 100644
--- a/testing/dispatch_readsync.c
+++ b/testing/dispatch_readsync.c
@@ -23,12 +23,7 @@
 #include <dispatch/dispatch.h>
 #define __DISPATCH_INDIRECT__
 #include "src/queue_private.h"
-#include <pthread.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <limits.h>
-#include <assert.h>
-
+#include "system.h"
 #include "dispatch_test.h"
 
 #define LAPS 10000
diff --git a/testing/dispatch_sema.c b/testing/dispatch_sema.c
index 24e0b62..aeab495 100644
--- a/testing/dispatch_sema.c
+++ b/testing/dispatch_sema.c
@@ -21,10 +21,7 @@
 #include "config/config.h"
 
 #include <dispatch/dispatch.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <assert.h>
-
+#include "system.h"
 #include "dispatch_test.h"
 
 #define LAPS 10000
diff --git a/testing/dispatch_starfish.c b/testing/dispatch_starfish.c
index a2b965a..4946093 100644
--- a/testing/dispatch_starfish.c
+++ b/testing/dispatch_starfish.c
@@ -22,9 +22,7 @@
 
 #include <dispatch/dispatch.h>
 #include "src/internal.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
+#include "system.h"
 #if HAVE_TARGETCONDITIONALS_H
 #include <TargetConditionals.h>
 #endif
diff --git a/testing/dispatch_test.c b/testing/dispatch_test.c
index 859d5a2..574d6dd 100644
--- a/testing/dispatch_test.c
+++ b/testing/dispatch_test.c
@@ -1,16 +1,8 @@
 #include "config/config.h"
 
 #include <sys/types.h>
-#include <sys/wait.h>
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
+#include "system.h"
 #include <sys/errno.h>
-#include <string.h>
-
 #include "dispatch_test.h"
 
 #define _test_print(_file, _line, _desc, \
diff --git a/testing/dispatch_timer_bit31.c b/testing/dispatch_timer_bit31.c
index e326cdb..6c09bab 100644
--- a/testing/dispatch_timer_bit31.c
+++ b/testing/dispatch_timer_bit31.c
@@ -19,12 +19,7 @@
  */
 
 #include "config/config.h"
-
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/time.h>
-
+#include "system.h"
 #include <dispatch/dispatch.h>
 
 #include "dispatch_test.h"
diff --git a/testing/dispatch_timer_bit63.c b/testing/dispatch_timer_bit63.c
index f4fe1d5..e03fe14 100644
--- a/testing/dispatch_timer_bit63.c
+++ b/testing/dispatch_timer_bit63.c
@@ -19,12 +19,7 @@
  */
 
 #include "config/config.h"
-
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/time.h>
-
+#include "system.h"
 #include <dispatch/dispatch.h>
 
 #include "dispatch_test.h"
diff --git a/testing/dispatch_timer_set_time.c b/testing/dispatch_timer_set_time.c
index b15330d..b1e075c 100644
--- a/testing/dispatch_timer_set_time.c
+++ b/testing/dispatch_timer_set_time.c
@@ -1,9 +1,5 @@
 #include "config/config.h"
-
-#include <sys/time.h>
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
+#include "system.h"
 
 #define	__DISPATCH_INDIRECT__
 #include "src/internal.h"
diff --git a/testing/fd_stress.c b/testing/fd_stress.c
index a4b1ce2..ee977f2 100644
--- a/testing/fd_stress.c
+++ b/testing/fd_stress.c
@@ -27,17 +27,8 @@
 #include "config/config.h"
 
 #include <dispatch/dispatch.h>
-
-#include <assert.h>
+#include "system.h"
 #include <CommonCrypto/CommonDigest.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/param.h>
-#include <unistd.h>
 
 static inline size_t max(size_t a, size_t b) {
 	return (a > b) ? a : b;
diff --git a/testing/harness.c b/testing/harness.c
index 594b901..4c23d21 100644
--- a/testing/harness.c
+++ b/testing/harness.c
@@ -21,12 +21,7 @@
 #include "config/config.h"
 
 #include <dispatch/dispatch.h>
-#include <assert.h>
-#include <spawn.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <signal.h>
+#include "system.h"
 #include <mach/clock_types.h>
 
 #include "dispatch_test.h"
diff --git a/testing/queue_finalizer.c b/testing/queue_finalizer.c
index 950fa73..4f3e232 100644
--- a/testing/queue_finalizer.c
+++ b/testing/queue_finalizer.c
@@ -21,13 +21,7 @@
 #include "config/config.h"
 
 #include <dispatch/dispatch.h>
-
-#include <unistd.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-
+#include "system.h"
 #include "dispatch_test.h"
 
 void *ctxt_magic;
diff --git a/testing/summarize.c b/testing/summarize.c
index 549e733..4fb4e6f 100644
--- a/testing/summarize.c
+++ b/testing/summarize.c
@@ -19,10 +19,7 @@
  */
 
 #include "config/config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "system.h"
 
 int
 has_prefix(const char* str, const char* prefix) {
diff --git a/testing/system.h b/testing/system.h
new file mode 100644
index 0000000..65b9653
--- /dev/null
+++ b/testing/system.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010 Apple Inc. All rights reserved.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_START@
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * @APPLE_APACHE_LICENSE_HEADER_END@
+ */
+
+#ifndef DISPATCH_TEST_SYSTEM_H
+#define DISPATCH_TEST_SYSTEM_H
+
+#include <sys/sysctl.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <unistd.h>
+#include <assert.h>
+#include <errno.h>
+#include <pthread.h>
+#include <math.h>
+#include <sys/time.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <spawn.h>
+#include <signal.h>
+#include <netinet/in.h>
+#include <sys/param.h>
+#ifdef __BLOCKS__
+#include <Block.h>
+#endif
+
+#endif
-- 
1.7.0.1


>From 5a085595bf7b65ed384477b0251c84e6acbb157d Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <bonzini@gnu.org>
Date: Tue, 8 Jun 2010 10:02:11 +0200
Subject: [PATCH 2/2] work around usage of __block in glibc's unistd.h

---
 src/private.h    |    2 ++
 testing/system.h |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/private.h b/src/private.h
index 17875e2..5b1ce7e 100644
--- a/src/private.h
+++ b/src/private.h
@@ -33,7 +33,9 @@
 #include <mach/message.h>
 #endif
 #if HAVE_UNISTD_H
+#define __block __libc_block
 #include <unistd.h>
+#undef __block
 #endif
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
diff --git a/testing/system.h b/testing/system.h
index 65b9653..49656db 100644
--- a/testing/system.h
+++ b/testing/system.h
@@ -28,7 +28,9 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdbool.h>
+#define __block __libc_block
 #include <unistd.h>
+#undef __block
 #include <assert.h>
 #include <errno.h>
 #include <pthread.h>
-- 
1.7.0.1