diff options
Diffstat (limited to 'Source/WTF/wtf/spi')
| -rw-r--r-- | Source/WTF/wtf/spi/darwin/CommonCryptoSPI.h | 41 | ||||
| -rw-r--r-- | Source/WTF/wtf/spi/darwin/XPCSPI.h | 14 |
2 files changed, 11 insertions, 44 deletions
diff --git a/Source/WTF/wtf/spi/darwin/CommonCryptoSPI.h b/Source/WTF/wtf/spi/darwin/CommonCryptoSPI.h deleted file mode 100644 index 325cbe81b..000000000 --- a/Source/WTF/wtf/spi/darwin/CommonCryptoSPI.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2015 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef CommonCryptoSPI_h -#define CommonCryptoSPI_h - -#if OS(DARWIN) - -#if USE(APPLE_INTERNAL_SDK) -#include <CommonCrypto/CommonRandomSPI.h> -#endif - -typedef struct __CCRandom* CCRandomRef; -extern const CCRandomRef kCCRandomDefault; -extern "C" int CCRandomCopyBytes(CCRandomRef rnd, void *bytes, size_t count); - -#endif // OS(DARWIN) - -#endif /* CommonCryptoSPI_h */ diff --git a/Source/WTF/wtf/spi/darwin/XPCSPI.h b/Source/WTF/wtf/spi/darwin/XPCSPI.h index e30315ab5..2820b9d04 100644 --- a/Source/WTF/wtf/spi/darwin/XPCSPI.h +++ b/Source/WTF/wtf/spi/darwin/XPCSPI.h @@ -56,11 +56,15 @@ typedef void* xpc_connection_t; typedef const struct _xpc_type_s* xpc_type_t; +#if PLATFORM(IOS) && __has_attribute(noescape) +#define XPC_NOESCAPE __attribute__((__noescape__)) +#endif + #if COMPILER_SUPPORTS(BLOCKS) typedef bool (^xpc_array_applier_t)(size_t index, xpc_object_t); typedef bool (^xpc_dictionary_applier_t)(const char *key, xpc_object_t value); typedef void (^xpc_handler_t)(xpc_object_t); -#endif +#endif // COMPILER_SUPPORTS(BLOCKS) typedef void (*xpc_connection_handler_t)(xpc_connection_t connection); @@ -79,6 +83,10 @@ typedef void (*xpc_connection_handler_t)(xpc_connection_t connection); #include <xpc/private.h> #endif +#if !defined(XPC_NOESCAPE) +#define XPC_NOESCAPE +#endif + EXTERN_C const struct _xpc_dictionary_s _xpc_error_connection_invalid; EXTERN_C const struct _xpc_dictionary_s _xpc_error_termination_imminent; @@ -90,8 +98,8 @@ EXTERN_C const struct _xpc_type_s _xpc_type_string; EXTERN_C xpc_object_t xpc_array_create(const xpc_object_t*, size_t count); #if COMPILER_SUPPORTS(BLOCKS) -EXTERN_C bool xpc_array_apply(xpc_object_t, xpc_array_applier_t); -EXTERN_C bool xpc_dictionary_apply(xpc_object_t xdict, xpc_dictionary_applier_t applier); +EXTERN_C bool xpc_array_apply(xpc_object_t, XPC_NOESCAPE xpc_array_applier_t); +EXTERN_C bool xpc_dictionary_apply(xpc_object_t xdict, XPC_NOESCAPE xpc_dictionary_applier_t applier); #endif EXTERN_C size_t xpc_array_get_count(xpc_object_t); EXTERN_C const char* xpc_array_get_string(xpc_object_t, size_t index); |