September 2009 - libdispatch-changes

[46] trunk/config/config.h
by source_changes＠macosforge.org 26 Sep '09

26 Sep '09

Revision: 46 http://trac.macosforge.org/projects/libdispatch/changeset/46 Author: robert(a)fledge.watson.org Date: 2009-09-26 12:29:18 -0700 (Sat, 26 Sep 2009) Log Message: ----------- Update Xcode version of config.h for recent configure.ac changes. Modified Paths: -------------- trunk/config/config.h Modified: trunk/config/config.h =================================================================== --- trunk/config/config.h 2009-09-26 19:23:40 UTC (rev 45) +++ trunk/config/config.h 2009-09-26 19:29:18 UTC (rev 46) @@ -58,6 +58,12 @@ /* Define to 1 if you have the <memory.h> header file. */ #define HAVE_MEMORY_H 1 +/* Define if __builtin_trap marked noreturn */ +#define HAVE_NORETURN_BUILTIN_TRAP /**/ + +/* Define if __private_extern__ present */ +#define HAVE_PRIVATE_EXTERN /**/ + /* Define to 1 if you have the `pthread_key_init_np' function. */ #define HAVE_PTHREAD_KEY_INIT_NP 1 @@ -116,7 +122,7 @@ #define STDC_HEADERS 1 /* Define to use Mac OS X crashreporter info */ -#define USE_APPLE_CRASHREPORTER_INFO +#define USE_APPLE_CRASHREPORTER_INFO /**/ /* Define to use non-portablesemaphore optimizations for Mac OS X */ #define USE_APPLE_SEMAPHORE_OPTIMIZATIONS /**/

1 0

[45] trunk
by source_changes＠macosforge.org 26 Sep '09

26 Sep '09

Revision: 45 http://trac.macosforge.org/projects/libdispatch/changeset/45 Author: robert(a)fledge.watson.org Date: 2009-09-26 12:23:40 -0700 (Sat, 26 Sep 2009) Log Message: ----------- Some versions of clang appear not to mark __builtin_trap() as __noreturn__, leading to a compile error as dispatch_main(), which relies on __builtin_trap() to exit in various error cases, is marked __no_return__. Detect this bug/feature in configure, and handle. Modified Paths: -------------- trunk/configure.ac trunk/src/queue.c Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-09-26 18:45:51 UTC (rev 44) +++ trunk/configure.ac 2009-09-26 19:23:40 UTC (rev 45) @@ -248,6 +248,15 @@ AC_SUBST([CBLOCKS_FLAGS]) # +# Temporary: some versions of clang do not mark __builtin_trap() as +# __attribute__((__noreturn__)). Detect and add if required. +# +AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([void __attribute__((__noreturn__)) temp(void) { __builtin_trap(); }], [])], [ + AC_DEFINE(HAVE_NORETURN_BUILTIN_TRAP,,[Define if __builtin_trap marked noreturn]) + ], []) + +# # Generate Makefiles. # AC_CONFIG_FILES([Makefile dispatch/Makefile man/Makefile src/Makefile]) Modified: trunk/src/queue.c =================================================================== --- trunk/src/queue.c 2009-09-26 18:45:51 UTC (rev 44) +++ trunk/src/queue.c 2009-09-26 19:23:40 UTC (rev 45) @@ -884,6 +884,15 @@ } #endif +/* + * XXXRW: Work-around for possible clang bug in which __builtin_trap() is not + * marked noreturn, leading to a build error as dispatch_main() *is* marked + * noreturn. Mask by marking __builtin_trap() as noreturn locally. + */ +#ifndef HAVE_NORETURN_BUILTIN_TRAP +void __builtin_trap(void) __attribute__((__noreturn__)); +#endif + void dispatch_main(void) {

1 0

[44] trunk/src/Makefile.am
by source_changes＠macosforge.org 26 Sep '09

26 Sep '09

Revision: 44 http://trac.macosforge.org/projects/libdispatch/changeset/44 Author: robert(a)fledge.watson.org Date: 2009-09-26 11:45:51 -0700 (Sat, 26 Sep 2009) Log Message: ----------- Don't build with -Werror, just -Wall: libdispatch sees a number of warnings when built with clang rather than gcc. Modified Paths: -------------- trunk/src/Makefile.am Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2009-09-26 18:30:55 UTC (rev 43) +++ trunk/src/Makefile.am 2009-09-26 18:45:51 UTC (rev 44) @@ -15,7 +15,7 @@ source.c \ time.c -libdispatch_la_CFLAGS=-Wall -Werror +libdispatch_la_CFLAGS=-Wall INCLUDES=-I$(top_builddir) -I$(top_srcdir) \ @APPLE_LIBC_SOURCE_PATH@ @APPLE_XNU_SOURCE_PATH@

1 0

[43] trunk
by source_changes＠macosforge.org 26 Sep '09

26 Sep '09

Revision: 43 http://trac.macosforge.org/projects/libdispatch/changeset/43 Author: robert(a)fledge.watson.org Date: 2009-09-26 11:30:55 -0700 (Sat, 26 Sep 2009) Log Message: ----------- Autoconf/automake support for configuring and compiling Blocks support, tested on FreeBSD/i386: - Detect whether the blocks syntax is supported using -fblocks. - If it is, try to link without additional libraries. - If that fails, try -lBlocksRuntime in case clang -fblocks doesn't automatically add a dependency on the runtime. - Allow the user to specify the path to the lib directory where that runtime can be found, if required. Modified Paths: -------------- trunk/configure.ac trunk/src/Makefile.am Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-09-26 11:43:02 UTC (rev 42) +++ trunk/configure.ac 2009-09-26 18:30:55 UTC (rev 43) @@ -188,6 +188,66 @@ ]) # +# Detect compiler support for Blocks; perhaps someday -fblocks won't be +# required, in which case we'll need to change this. +# +AC_CACHE_CHECK([for C Blocks support], [dispatch_cv_cblocks], [ + saveCFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fblocks" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[(void)^{int i; i = 0; }();])], [ + CFLAGS="$saveCFLAGS" + dispatch_cv_cblocks="-fblocks" + ], [ + CFLAGS="$saveCFLAGS" + dispatch_cv_cblocks="no" + ]) +]) + +# +# Allow configure to be passed a path to the directory where it should look +# for the Blocks runtime library, if any. +# +AC_ARG_WITH([blocks-runtime], + [AS_HELP_STRING([--with-blocks-runtime], + [Specify path to the blocks runtime])], + [blocks_runtime=${withval} + LIBS="$LIBS -L$blocks_runtime"] +) + +AS_IF([test "x$dispatch_cv_cblocks" != "xno"], [ + CBLOCKS_FLAGS="$dispatch_cv_cblocks" + + # + # It may be necessary to directly link the Blocks runtime on some + # systems, so give it a try if we can't link a C program that uses + # Blocks. We will want to remove this at somepoint, as really -fblocks + # should force that linkage already. + # + saveCFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fblocks" + AC_MSG_CHECKING([whether additional libraries are required for the Blocks runtime]) + AC_TRY_LINK([], [ + ^{ int j; j=0; }(); + ], [ + AC_MSG_RESULT([no]); + ], [ + saveLIBS="$LIBS" + LIBS="$LIBS -lBlocksRuntime" + AC_TRY_LINK([], [ + ^{ int k; k=0; }(); + ], [ + AC_MSG_RESULT([-lBlocksRuntime]) + ], [ + AC_MSG_ERROR([can't find Blocks runtime]) + ]) + ]) + CFLAGS="$saveCFLAGS" +], [ + CBLOCKS_FLAGS="" +]) +AC_SUBST([CBLOCKS_FLAGS]) + +# # Generate Makefiles. # AC_CONFIG_FILES([Makefile dispatch/Makefile man/Makefile src/Makefile]) Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2009-09-26 11:43:02 UTC (rev 42) +++ trunk/src/Makefile.am 2009-09-26 18:30:55 UTC (rev 43) @@ -19,7 +19,7 @@ INCLUDES=-I$(top_builddir) -I$(top_srcdir) \ @APPLE_LIBC_SOURCE_PATH@ @APPLE_XNU_SOURCE_PATH@ -libdispatch_la_CFLAGS+=$(MARCH_FLAGS) +libdispatch_la_CFLAGS+=$(MARCH_FLAGS) $(CBLOCKS_FLAGS) if USE_LEGACY_API libdispatch_la_SOURCES+= \

1 0

[42] trunk/src/hw_shims.h
by source_changes＠macosforge.org 26 Sep '09

26 Sep '09

Revision: 42 http://trac.macosforge.org/projects/libdispatch/changeset/42 Author: robert(a)fledge.watson.org Date: 2009-09-26 04:43:02 -0700 (Sat, 26 Sep 2009) Log Message: ----------- Cast the results of __sync_lock_test_and_set() back to the original type passed into dispatch_atomic_xchg() so that the caller isn't doing an implicit conversion from an integer type to a pointer. This fixes errors when using gcc built-in atomics with clang on FreeBSD/i386. Modified Paths: -------------- trunk/src/hw_shims.h Modified: trunk/src/hw_shims.h =================================================================== --- trunk/src/hw_shims.h 2009-09-25 18:31:19 UTC (rev 41) +++ trunk/src/hw_shims.h 2009-09-26 11:43:02 UTC (rev 42) @@ -39,7 +39,7 @@ #if 0 && defined(__i386__) || defined(__x86_64__) #define dispatch_atomic_xchg(p, n) ({ typeof(*(p)) _r; asm("xchg %0, %1" : "=r" (_r) : "m" (*(p)), "0" (n)); _r; }) #else -#define dispatch_atomic_xchg(p, n) __sync_lock_test_and_set((p), (n)) +#define dispatch_atomic_xchg(p, n) ((typeof(*(p)))__sync_lock_test_and_set((p), (n))) #endif #define dispatch_atomic_cmpxchg(p, o, n) __sync_bool_compare_and_swap((p), (o), (n)) #define dispatch_atomic_inc(p) __sync_add_and_fetch((p), 1)

1 0

[41] trunk
by source_changes＠macosforge.org 25 Sep '09

25 Sep '09

Revision: 41 http://trac.macosforge.org/projects/libdispatch/changeset/41 Author: robert(a)fledge.watson.org Date: 2009-09-25 11:31:19 -0700 (Fri, 25 Sep 2009) Log Message: ----------- Hook up man pages; mlinks not installed yet. Modified Paths: -------------- trunk/Makefile.am trunk/configure.ac Added Paths: ----------- trunk/man/Makefile.am Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2009-09-25 09:53:30 UTC (rev 40) +++ trunk/Makefile.am 2009-09-25 18:31:19 UTC (rev 41) @@ -4,4 +4,5 @@ SUBDIRS= \ dispatch \ + man \ src Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-09-25 09:53:30 UTC (rev 40) +++ trunk/configure.ac 2009-09-25 18:31:19 UTC (rev 41) @@ -190,5 +190,5 @@ # # Generate Makefiles. # -AC_CONFIG_FILES([Makefile dispatch/Makefile src/Makefile]) +AC_CONFIG_FILES([Makefile dispatch/Makefile man/Makefile src/Makefile]) AC_OUTPUT Added: trunk/man/Makefile.am =================================================================== --- trunk/man/Makefile.am (rev 0) +++ trunk/man/Makefile.am 2009-09-25 18:31:19 UTC (rev 41) @@ -0,0 +1,18 @@ +# +# +# + +man3_MANS= \ + dispatch.3 \ + dispatch_after.3 \ + dispatch_api.3 \ + dispatch_apply.3 \ + dispatch_async.3 \ + dispatch_benchmark.3 \ + dispatch_group_create.3 \ + dispatch_object.3 \ + dispatch_once.3 \ + dispatch_queue_create.3 \ + dispatch_semaphore_create.3 \ + dispatch_source_create.3 \ + dispatch_time.3

1 0

[40] trunk
by source_changes＠macosforge.org 25 Sep '09

25 Sep '09

Revision: 40 http://trac.macosforge.org/projects/libdispatch/changeset/40 Author: robert(a)fledge.watson.org Date: 2009-09-25 02:53:30 -0700 (Fri, 25 Sep 2009) Log Message: ----------- Rather than hard-code -march in order to enable gcc built-in atomics on i386, which caused build problems for other architectures, add configure support for detecting the requirement. This proves somewhat subtle: gcc is sometimes able to partially implement built-in atomics even with reduced instruction sets and will only fall back to unimplemented library symbols. As such, we must specifically not just test for __sync_add_and_fetch linking, but also with it used with a return value. Arguably, we should only try -march=i486 on i386 systems. Submitted by: Peter O'Gorman (earlier version) Modified Paths: -------------- trunk/configure.ac trunk/src/Makefile.am Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-09-25 08:44:52 UTC (rev 39) +++ trunk/configure.ac 2009-09-25 09:53:30 UTC (rev 40) @@ -109,6 +109,32 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) # +# This is a bit subtle: on i386 systems without at least -march=i486 defined, +# certain built-in atomics fall back to depending on undefined symbols if +# their return values are used. +# +AC_CACHE_CHECK([for gcc atomic builtins],[dispatch_cv_atomic], +[AC_LINK_IFELSE([AC_LANG_PROGRAM([],[[ +int i, x =0; +i = __sync_add_and_fetch(&x,1); +return x;]])],[dispatch_cv_atomic=yes], + [saveCFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -march=i486" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[[ + int i, x =0; + i = __sync_add_and_fetch(&x,1); + return x;]])],[CFLAGS="$saveCFLAGS" +dispatch_cv_atomic="-march=i486" +])])]) + +case $dispatch_cv_atomic in + yes) ;; + -march*) MARCH_FLAGS="$dispatch_cv_atomic" + AC_SUBST([MARCH_FLAGS]) ;; + *) AC_MSG_ERROR([No gcc builtin atomic operations available]) ;; +esac + +# # Find libraries we will need # AC_SEARCH_LIBS(clock_gettime, rt) Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2009-09-25 08:44:52 UTC (rev 39) +++ trunk/src/Makefile.am 2009-09-25 09:53:30 UTC (rev 40) @@ -19,13 +19,7 @@ INCLUDES=-I$(top_builddir) -I$(top_srcdir) \ @APPLE_LIBC_SOURCE_PATH@ @APPLE_XNU_SOURCE_PATH@ -# -# This will need some refinement: gcc requires a minimum of -march=i486 on -# x86 in order to implement built-in atomic operations. But when should we -# define this optional argument? We need appropriate configure parts to make -# this conditional. -# -libdispatch_la_CFLAGS+=-march=i686 +libdispatch_la_CFLAGS+=$(MARCH_FLAGS) if USE_LEGACY_API libdispatch_la_SOURCES+= \

1 0

[39] trunk
by source_changes＠macosforge.org 25 Sep '09

25 Sep '09

Revision: 39 http://trac.macosforge.org/projects/libdispatch/changeset/39 Author: robert(a)fledge.watson.org Date: 2009-09-25 01:44:52 -0700 (Fri, 25 Sep 2009) Log Message: ----------- Because dispatch.h is a publicly included header, we can't rely on compat/Availability.h being available. Instead, provide a conditional definition of __OSX_AVAILABLE_STARTING in dispatch.h. Modified Paths: -------------- trunk/dispatch/dispatch.h trunk/src/internal.h Removed Paths: ------------- trunk/compat/Availability.h Deleted: trunk/compat/Availability.h =================================================================== --- trunk/compat/Availability.h 2009-09-18 09:57:17 UTC (rev 38) +++ trunk/compat/Availability.h 2009-09-25 08:44:52 UTC (rev 39) @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2009 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 __AVAILABILITY_H__ -#define __AVAILABILITY_H__ - -#define __OSX_AVAILABLE_STARTING(x, y) - -#endif /* __AVAILABILITY_H__ */ Modified: trunk/dispatch/dispatch.h =================================================================== --- trunk/dispatch/dispatch.h 2009-09-18 09:57:17 UTC (rev 38) +++ trunk/dispatch/dispatch.h 2009-09-25 08:44:52 UTC (rev 39) @@ -30,6 +30,10 @@ #include <stdbool.h> #include <stdarg.h> +#ifndef __OSX_AVAILABLE_STARTING +#define __OSX_AVAILABLE_STARTING(x, y) +#endif + #define DISPATCH_API_VERSION 20090501 #ifndef __DISPATCH_BUILDING_DISPATCH__ Modified: trunk/src/internal.h =================================================================== --- trunk/src/internal.h 2009-09-18 09:57:17 UTC (rev 38) +++ trunk/src/internal.h 2009-09-25 08:44:52 UTC (rev 39) @@ -38,8 +38,6 @@ #ifdef HAVE_AVAILABILITY_H #include <Availability.h> -#else -#include <compat/Availability.h> #endif #ifndef HAVE_PRIVATE_EXTERN #include <compat/private_extern.h>

1 0

[38] trunk/dispatch/Makefile.am
by source_changes＠macosforge.org 18 Sep '09

18 Sep '09

Revision: 38 http://trac.macosforge.org/projects/libdispatch/changeset/38 Author: robert(a)fledge.watson.org Date: 2009-09-18 02:57:17 -0700 (Fri, 18 Sep 2009) Log Message: ----------- Adding missing Makefile.am. Reported by: Dag-Erling Smorgrav Added Paths: ----------- trunk/dispatch/Makefile.am Added: trunk/dispatch/Makefile.am =================================================================== --- trunk/dispatch/Makefile.am (rev 0) +++ trunk/dispatch/Makefile.am 2009-09-18 09:57:17 UTC (rev 38) @@ -0,0 +1,17 @@ +# +# +# + +dispatchdir=$(includedir)/dispatch + +dispatch_HEADERS= \ + base.h \ + dispatch.h \ + group.h \ + object.h \ + once.h \ + queue.h \ + semaphore.h \ + source.h \ + time.h + Property changes on: trunk/dispatch/Makefile.am ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + FreeBSD=%H Added: svn:eol-style + native

1 0

[37] trunk/libdispatch.xcodeproj/project.pbxproj
by source_changes＠macosforge.org 16 Sep '09

16 Sep '09

Revision: 37 http://trac.macosforge.org/projects/libdispatch/changeset/37 Author: kvv(a)apple.com Date: 2009-09-16 10:49:34 -0700 (Wed, 16 Sep 2009) Log Message: ----------- Updated Xcode project to reference public headers in dispatch directory. Modified Paths: -------------- trunk/libdispatch.xcodeproj/project.pbxproj Modified: trunk/libdispatch.xcodeproj/project.pbxproj =================================================================== --- trunk/libdispatch.xcodeproj/project.pbxproj 2009-09-16 10:23:34 UTC (rev 36) +++ trunk/libdispatch.xcodeproj/project.pbxproj 2009-09-16 17:49:34 UTC (rev 37) @@ -45,18 +45,18 @@ /* Begin PBXFileReference section */ 2EC9C9B70E8809EF00E2499A /* legacy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = legacy.c; path = src/legacy.c; sourceTree = "<group>"; }; 5A5D13AB0F6B280500197CC3 /* semaphore_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = semaphore_internal.h; path = src/semaphore_internal.h; sourceTree = "<group>"; }; - 721F5C5C0F15520500FF03A6 /* semaphore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = semaphore.h; path = src/semaphore.h; sourceTree = "<group>"; }; + 721F5C5C0F15520500FF03A6 /* semaphore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = semaphore.h; path = dispatch/semaphore.h; sourceTree = "<group>"; }; 721F5CCE0F15553500FF03A6 /* semaphore.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = semaphore.c; path = src/semaphore.c; sourceTree = "<group>"; }; 72B54F690EB169EB00DBECBA /* dispatch_source_create.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; name = dispatch_source_create.3; path = man/dispatch_source_create.3; sourceTree = "<group>"; }; 72CC940C0ECCD5720031B751 /* dispatch_object.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; name = dispatch_object.3; path = man/dispatch_object.3; sourceTree = "<group>"; }; 72CC940D0ECCD5720031B751 /* dispatch.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; name = dispatch.3; path = man/dispatch.3; sourceTree = "<group>"; }; - 72CC942F0ECCD8750031B751 /* base.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base.h; path = src/base.h; sourceTree = "<group>"; }; + 72CC942F0ECCD8750031B751 /* base.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base.h; path = dispatch/base.h; sourceTree = "<group>"; }; 96032E4A0F5CC8C700241C5F /* time.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = time.c; path = src/time.c; sourceTree = "<group>"; }; - 96032E4C0F5CC8D100241C5F /* time.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = time.h; path = src/time.h; sourceTree = "<group>"; }; + 96032E4C0F5CC8D100241C5F /* time.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = time.h; path = dispatch/time.h; sourceTree = "<group>"; }; 960F0E7D0F3FB232000D88BF /* dispatch_apply.3 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dispatch_apply.3; path = man/dispatch_apply.3; sourceTree = "<group>"; }; 960F0E7E0F3FB232000D88BF /* dispatch_once.3 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dispatch_once.3; path = man/dispatch_once.3; sourceTree = "<group>"; }; - 961B99350F3E83980006BC96 /* benchmark.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = benchmark.h; path = src/benchmark.h; sourceTree = "<group>"; }; - 961B994F0F3E85C30006BC96 /* object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = object.h; path = src/object.h; sourceTree = "<group>"; }; + 961B99350F3E83980006BC96 /* benchmark.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = benchmark.h; path = dispatch/benchmark.h; sourceTree = "<group>"; }; + 961B994F0F3E85C30006BC96 /* object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = object.h; path = dispatch/object.h; sourceTree = "<group>"; }; 963FDDE50F3FB6BD00BF2D00 /* dispatch_semaphore_create.3 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dispatch_semaphore_create.3; path = man/dispatch_semaphore_create.3; sourceTree = "<group>"; }; 965CD6340F3E806200D4E28D /* benchmark.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = benchmark.c; path = src/benchmark.c; sourceTree = "<group>"; }; 965ECC200F3EAB71004DDD89 /* object_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = object_internal.h; path = src/object_internal.h; sourceTree = "<group>"; }; @@ -68,25 +68,25 @@ 96929D950F3EA2170041FF5D /* queue_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = queue_internal.h; path = src/queue_internal.h; sourceTree = "<group>"; }; 96A8AA860F41E7A400CD570B /* source.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = source.c; path = src/source.c; sourceTree = "<group>"; }; 96BC39BC0F3EBAB100C59689 /* queue_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = queue_private.h; path = src/queue_private.h; sourceTree = "<group>"; }; - 96C9553A0F3EAEDD000D2CA4 /* once.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = once.h; path = src/once.h; sourceTree = "<group>"; }; + 96C9553A0F3EAEDD000D2CA4 /* once.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = once.h; path = dispatch/once.h; sourceTree = "<group>"; }; 96DF70BD0F38FE3C0074BD99 /* once.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = once.c; path = src/once.c; sourceTree = "<group>"; }; D2AAC046055464E500DB518D /* libdispatch.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libdispatch.a; sourceTree = BUILT_PRODUCTS_DIR; }; FC0B34780FA2851C0080FFA0 /* source_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = source_internal.h; path = src/source_internal.h; sourceTree = "<group>"; }; FC36279C0E933ED80054F1A3 /* dispatch_queue_create.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; name = dispatch_queue_create.3; path = man/dispatch_queue_create.3; sourceTree = "<group>"; }; - FC5C9C1D0EADABE3006E462D /* group.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = group.h; path = src/group.h; sourceTree = "<group>"; }; + FC5C9C1D0EADABE3006E462D /* group.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = group.h; path = dispatch/group.h; sourceTree = "<group>"; }; FC678DE80F97E0C300AB5993 /* dispatch_after.3 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dispatch_after.3; path = man/dispatch_after.3; sourceTree = "<group>"; }; FC678DE90F97E0C300AB5993 /* dispatch_api.3 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dispatch_api.3; path = man/dispatch_api.3; sourceTree = "<group>"; }; FC678DEA0F97E0C300AB5993 /* dispatch_async.3 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dispatch_async.3; path = man/dispatch_async.3; sourceTree = "<group>"; }; FC678DEB0F97E0C300AB5993 /* dispatch_group_create.3 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dispatch_group_create.3; path = man/dispatch_group_create.3; sourceTree = "<group>"; }; FC678DEC0F97E0C300AB5993 /* dispatch_time.3 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dispatch_time.3; path = man/dispatch_time.3; sourceTree = "<group>"; }; FC7BED8A0E8361E600161930 /* queue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = queue.c; path = src/queue.c; sourceTree = "<group>"; }; - FC7BED8B0E8361E600161930 /* queue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = queue.h; path = src/queue.h; sourceTree = "<group>"; }; - FC7BED8D0E8361E600161930 /* source.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = source.h; path = src/source.h; sourceTree = "<group>"; }; + FC7BED8B0E8361E600161930 /* queue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = queue.h; path = dispatch/queue.h; sourceTree = "<group>"; }; + FC7BED8D0E8361E600161930 /* source.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = source.h; path = dispatch/source.h; sourceTree = "<group>"; }; FC7BED8F0E8361E600161930 /* internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = internal.h; path = src/internal.h; sourceTree = "<group>"; }; FC7BED900E8361E600161930 /* legacy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = legacy.h; path = src/legacy.h; sourceTree = "<group>"; }; FC7BED930E8361E600161930 /* private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = private.h; path = src/private.h; sourceTree = "<group>"; }; FC7BED950E8361E600161930 /* protocol.defs */ = {isa = PBXFileReference; explicitFileType = sourcecode.mig; fileEncoding = 4; name = protocol.defs; path = src/protocol.defs; sourceTree = "<group>"; }; - FC7BED960E8361E600161930 /* dispatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dispatch.h; path = src/dispatch.h; sourceTree = "<group>"; }; + FC7BED960E8361E600161930 /* dispatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dispatch.h; path = dispatch/dispatch.h; sourceTree = "<group>"; }; FC7BED970E8361E600161930 /* shims.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = shims.c; path = src/shims.c; sourceTree = "<group>"; }; FC9C70E7105EC9620074F9CA /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = config/config.h; sourceTree = "<group>"; }; FCEF047F0F5661960067401F /* source_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = source_private.h; path = src/source_private.h; sourceTree = "<group>"; };

1 0