diff -rup include-10.15/Availability.h include-10.15-fixed/Availability.h --- include-10.15/Availability.h 2019-05-19 01:52:51.000000000 +0000 +++ include-10.15-fixed/Availability.h 2019-06-09 20:29:31.000000000 +0000 @@ -275,12 +275,20 @@ #endif /* #if __has_builtin(__is_target_arch) */ #ifndef __OSX_AVAILABLE_STARTING + #if defined(__has_attribute) && defined(__has_feature) + #if __has_attribute(availability) #define __OSX_AVAILABLE_STARTING(_osx, _ios) __AVAILABILITY_INTERNAL##_osx #define __OSX_AVAILABLE_BUT_DEPRECATED(_osxIntro, _osxDep, _iosIntro, _iosDep) \ __AVAILABILITY_INTERNAL##_osxIntro##_DEP##_osxDep #define __OSX_AVAILABLE_BUT_DEPRECATED_MSG(_osxIntro, _osxDep, _iosIntro, _iosDep, _msg) \ __AVAILABILITY_INTERNAL##_osxIntro##_DEP##_osxDep##_MSG(_msg) - #endif /* __OSX_AVAILABLE_STARTING */ + #else + #define __OSX_AVAILABLE_STARTING(_osx, _ios) + #define __OSX_AVAILABLE_BUT_DEPRECATED(_osxIntro, _osxDep, _iosIntro, _iosDep) + #define __OSX_AVAILABLE_BUT_DEPRECATED_MSG(_osxIntro, _osxDep, _iosIntro, _iosDep, _msg) + #endif + #endif +#endif /* __OSX_AVAILABLE_STARTING */ #else #define __OSX_AVAILABLE_STARTING(_osx, _ios) diff -rup include-10.15/AvailabilityInternal.h include-10.15-fixed/AvailabilityInternal.h --- include-10.15/AvailabilityInternal.h 2019-06-01 22:49:27.000000000 +0000 +++ include-10.15-fixed/AvailabilityInternal.h 2019-06-09 20:29:01.000000000 +0000 @@ -1,3 +1,12 @@ +/* DO NOT EDIT THIS FILE. + + It has been auto-edited by fixincludes from: + + "/usr/include/AvailabilityInternal.h" + + This had to be done to correct non-standard usages in the + original, manufacturer supplied header file. */ + /* * Copyright (c) 2007-2016 by Apple Inc.. All rights reserved. * @@ -34,6 +43,8 @@ #include #endif +#include + #ifndef __MAC_OS_X_VERSION_MIN_REQUIRED #ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ /* compiler for Mac OS X sets __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ */ @@ -4448,7 +4459,15 @@ #endif #define __API_AVAILABLE_PLATFORM_driverkit(x) driverkit,introduced=x - #define __API_A(x) __attribute__((availability(__API_AVAILABLE_PLATFORM_##x))) + #if defined(__has_attribute) + #if __has_attribute(availability) +#define __API_A(x) __attribute__((availability(__API_AVAILABLE_PLATFORM_##x))) + #else + #define __API_A(x) + #endif +#else + #define __API_A(x) +#endif #define __API_AVAILABLE1(x) __API_A(x) #define __API_AVAILABLE2(x,y) __API_A(x) __API_A(y) #define __API_AVAILABLE3(x,y,z) __API_A(x) __API_A(y) __API_A(z) @@ -4486,7 +4505,15 @@ #endif #define __API_DEPRECATED_PLATFORM_driverkit(x,y) driverkit,introduced=x,deprecated=y - #define __API_D(msg,x) __attribute__((availability(__API_DEPRECATED_PLATFORM_##x,message=msg))) + #if defined(__has_attribute) + #if __has_attribute(availability) +#define __API_D(msg,x) __attribute__((availability(__API_DEPRECATED_PLATFORM_##x,message=msg))) + #else + #define __API_D(msg,x) + #endif +#else + #define __API_D(msg,x) +#endif #define __API_DEPRECATED_MSG2(msg,x) __API_D(msg,x) #define __API_DEPRECATED_MSG3(msg,x,y) __API_D(msg,x) __API_D(msg,y) #define __API_DEPRECATED_MSG4(msg,x,y,z) __API_DEPRECATED_MSG3(msg,x,y) __API_D(msg,z) @@ -4557,7 +4584,15 @@ #endif #define __API_UNAVAILABLE_PLATFORM_driverkit driverkit,unavailable - #define __API_U(x) __attribute__((availability(__API_UNAVAILABLE_PLATFORM_##x))) + #if defined(__has_attribute) + #if __has_attribute(availability) +#define __API_U(x) __attribute__((availability(__API_UNAVAILABLE_PLATFORM_##x))) + #else + #define __API_U(x) + #endif +#else + #define __API_U(x) +#endif #define __API_UNAVAILABLE1(x) __API_U(x) #define __API_UNAVAILABLE2(x,y) __API_U(x) __API_U(y) #define __API_UNAVAILABLE3(x,y,z) __API_UNAVAILABLE2(x,y) __API_U(z) diff -rup include-10.15/mach-o/dyld.h include-10.15-fixed/mach-o/dyld.h --- include-10.15/mach-o/dyld.h 2019-05-19 01:30:57.000000000 +0000 +++ include-10.15-fixed/mach-o/dyld.h 2019-06-08 00:57:22.000000000 +0000 @@ -104,7 +104,7 @@ extern void _tlv_atexit(void (*termFunc) * Never called. On-disk thread local variables contain a pointer to this. Once * the thread local is prepared, the pointer changes to a real handler such as tlv_get_addr. */ -extern void _tlv_bootstrap(void) __OSX_AVAILABLE_STARTING(__MAC_10_10, __IPHONE_8_0) __attribute__((availability(driverkit,unavailable))) ; +extern void _tlv_bootstrap(void) __OSX_AVAILABLE_STARTING(__MAC_10_10, __IPHONE_8_0) /* __attribute__((availability(driverkit,unavailable))) */; /* * The following dyld API's are deprecated as of Mac OS X 10.5. They are either @@ -147,22 +147,22 @@ typedef struct __NSObjectFileImage* NSOb /* NSObjectFileImage can only be used with MH_BUNDLE files */ -extern NSObjectFileImageReturnCode NSCreateObjectFileImageFromFile(const char* pathName, NSObjectFileImage *objectFileImage) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, "dlopen()"); -extern NSObjectFileImageReturnCode NSCreateObjectFileImageFromMemory(const void *address, size_t size, NSObjectFileImage *objectFileImage) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, ""); -extern bool NSDestroyObjectFileImage(NSObjectFileImage objectFileImage) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, "dlclose()"); - -extern uint32_t NSSymbolDefinitionCountInObjectFileImage(NSObjectFileImage objectFileImage) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, ""); -extern const char* NSSymbolDefinitionNameInObjectFileImage(NSObjectFileImage objectFileImage, uint32_t ordinal) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, ""); -extern uint32_t NSSymbolReferenceCountInObjectFileImage(NSObjectFileImage objectFileImage) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, ""); -extern const char* NSSymbolReferenceNameInObjectFileImage(NSObjectFileImage objectFileImage, uint32_t ordinal, bool *tentative_definition) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, ""); -extern bool NSIsSymbolDefinedInObjectFileImage(NSObjectFileImage objectFileImage, const char* symbolName) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.4, "dlsym()"); -extern void* NSGetSectionDataInObjectFileImage(NSObjectFileImage objectFileImage, const char* segmentName, const char* sectionName, size_t *size) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, "getsectiondata()"); +extern NSObjectFileImageReturnCode NSCreateObjectFileImageFromFile(const char* pathName, NSObjectFileImage *objectFileImage) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, "dlopen()"); +extern NSObjectFileImageReturnCode NSCreateObjectFileImageFromMemory(const void *address, size_t size, NSObjectFileImage *objectFileImage) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, ""); +extern bool NSDestroyObjectFileImage(NSObjectFileImage objectFileImage) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, "dlclose()"); + +extern uint32_t NSSymbolDefinitionCountInObjectFileImage(NSObjectFileImage objectFileImage) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, ""); +extern const char* NSSymbolDefinitionNameInObjectFileImage(NSObjectFileImage objectFileImage, uint32_t ordinal) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, ""); +extern uint32_t NSSymbolReferenceCountInObjectFileImage(NSObjectFileImage objectFileImage) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, ""); +extern const char* NSSymbolReferenceNameInObjectFileImage(NSObjectFileImage objectFileImage, uint32_t ordinal, bool *tentative_definition) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, ""); +extern bool NSIsSymbolDefinedInObjectFileImage(NSObjectFileImage objectFileImage, const char* symbolName) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.4, "dlsym()"); +extern void* NSGetSectionDataInObjectFileImage(NSObjectFileImage objectFileImage, const char* segmentName, const char* sectionName, size_t *size) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, "getsectiondata()"); typedef struct __NSModule* NSModule; -extern const char* NSNameOfModule(NSModule m) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, ""); -extern const char* NSLibraryNameForModule(NSModule m) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, ""); +extern const char* NSNameOfModule(NSModule m) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, ""); +extern const char* NSLibraryNameForModule(NSModule m) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, ""); -extern NSModule NSLinkModule(NSObjectFileImage objectFileImage, const char* moduleName, uint32_t options) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, "dlopen()"); +extern NSModule NSLinkModule(NSObjectFileImage objectFileImage, const char* moduleName, uint32_t options) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, "dlopen()"); #define NSLINKMODULE_OPTION_NONE 0x0 #define NSLINKMODULE_OPTION_BINDNOW 0x1 #define NSLINKMODULE_OPTION_PRIVATE 0x2 @@ -170,27 +170,27 @@ extern NSModule NSLinkModule(NSObjectFil #define NSLINKMODULE_OPTION_DONT_CALL_MOD_INIT_ROUTINES 0x8 #define NSLINKMODULE_OPTION_TRAILING_PHYS_NAME 0x10 -extern bool NSUnLinkModule(NSModule module, uint32_t options) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, ""); +extern bool NSUnLinkModule(NSModule module, uint32_t options) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, ""); #define NSUNLINKMODULE_OPTION_NONE 0x0 #define NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED 0x1 #define NSUNLINKMODULE_OPTION_RESET_LAZY_REFERENCES 0x2 /* symbol API */ typedef struct __NSSymbol* NSSymbol; -extern bool NSIsSymbolNameDefined(const char* symbolName) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.4, "dlsym()"); -extern bool NSIsSymbolNameDefinedWithHint(const char* symbolName, const char* libraryNameHint) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.4, "dlsym()"); -extern bool NSIsSymbolNameDefinedInImage(const struct mach_header* image, const char* symbolName) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.4, "dlsym()"); -extern NSSymbol NSLookupAndBindSymbol(const char* symbolName) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.4, "dlsym()"); -extern NSSymbol NSLookupAndBindSymbolWithHint(const char* symbolName, const char* libraryNameHint) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.4, "dlsym()"); -extern NSSymbol NSLookupSymbolInModule(NSModule module, const char* symbolName) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, "dlsym()"); -extern NSSymbol NSLookupSymbolInImage(const struct mach_header* image, const char* symbolName, uint32_t options) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, "dlsym()"); +extern bool NSIsSymbolNameDefined(const char* symbolName) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.4, "dlsym()"); +extern bool NSIsSymbolNameDefinedWithHint(const char* symbolName, const char* libraryNameHint) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.4, "dlsym()"); +extern bool NSIsSymbolNameDefinedInImage(const struct mach_header* image, const char* symbolName) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.4, "dlsym()"); +extern NSSymbol NSLookupAndBindSymbol(const char* symbolName) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.4, "dlsym()"); +extern NSSymbol NSLookupAndBindSymbolWithHint(const char* symbolName, const char* libraryNameHint) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.4, "dlsym()"); +extern NSSymbol NSLookupSymbolInModule(NSModule module, const char* symbolName) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, "dlsym()"); +extern NSSymbol NSLookupSymbolInImage(const struct mach_header* image, const char* symbolName, uint32_t options) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, "dlsym()"); #define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND 0x0 #define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW 0x1 #define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY 0x2 #define NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR 0x4 -extern const char* NSNameOfSymbol(NSSymbol symbol) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, ""); -extern void * NSAddressOfSymbol(NSSymbol symbol) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, "dlsym()"); -extern NSModule NSModuleForSymbol(NSSymbol symbol) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, "dladdr()"); +extern const char* NSNameOfSymbol(NSSymbol symbol) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, ""); +extern void * NSAddressOfSymbol(NSSymbol symbol) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, "dlsym()"); +extern NSModule NSModuleForSymbol(NSSymbol symbol) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, "dladdr()"); /* error handling API */ typedef enum { @@ -218,7 +218,7 @@ typedef enum { NSOtherErrorInvalidArgs } NSOtherErrorNumbers; -extern void NSLinkEditError(NSLinkEditErrors *c, int *errorNumber, const char** fileName, const char** errorString) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, "dlerror()"); +extern void NSLinkEditError(NSLinkEditErrors *c, int *errorNumber, const char** fileName, const char** errorString) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, "dlerror()"); typedef struct { void (*undefined)(const char* symbolName); @@ -227,27 +227,27 @@ typedef struct { const char* fileName, const char* errorString); } NSLinkEditErrorHandlers; -extern void NSInstallLinkEditErrorHandlers(const NSLinkEditErrorHandlers *handlers) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, ""); +extern void NSInstallLinkEditErrorHandlers(const NSLinkEditErrorHandlers *handlers) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, ""); -extern bool NSAddLibrary(const char* pathName) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.4, "dlopen()"); -extern bool NSAddLibraryWithSearching(const char* pathName) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.4, "dlopen()"); -extern const struct mach_header* NSAddImage(const char* image_name, uint32_t options) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, "dlopen()"); +extern bool NSAddLibrary(const char* pathName) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.4, "dlopen()"); +extern bool NSAddLibraryWithSearching(const char* pathName) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.4, "dlopen()"); +extern const struct mach_header* NSAddImage(const char* image_name, uint32_t options) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, "dlopen()"); #define NSADDIMAGE_OPTION_NONE 0x0 #define NSADDIMAGE_OPTION_RETURN_ON_ERROR 0x1 #define NSADDIMAGE_OPTION_WITH_SEARCHING 0x2 #define NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED 0x4 #define NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME 0x8 -extern bool _dyld_present(void) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, "always true"); -extern bool _dyld_launched_prebound(void) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, "moot"); -extern bool _dyld_all_twolevel_modules_prebound(void) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.3, 10.5, "moot"); -extern bool _dyld_bind_fully_image_containing_address(const void* address) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, "dlopen(RTLD_NOW)"); -extern bool _dyld_image_containing_address(const void* address) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.3, 10.5, "dladdr()"); -extern void _dyld_lookup_and_bind(const char* symbol_name, void **address, NSModule* module) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.4, "dlsym()"); -extern void _dyld_lookup_and_bind_with_hint(const char* symbol_name, const char* library_name_hint, void** address, NSModule* module) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.4, "dlsym()"); -extern void _dyld_lookup_and_bind_fully(const char* symbol_name, void** address, NSModule* module) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.1, 10.5, "dlsym()"); +extern bool _dyld_present(void) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, "always true"); +extern bool _dyld_launched_prebound(void) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, "moot"); +extern bool _dyld_all_twolevel_modules_prebound(void) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.3, 10.5, "moot"); +extern bool _dyld_bind_fully_image_containing_address(const void* address) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, "dlopen(RTLD_NOW)"); +extern bool _dyld_image_containing_address(const void* address) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.3, 10.5, "dladdr()"); +extern void _dyld_lookup_and_bind(const char* symbol_name, void **address, NSModule* module) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.4, "dlsym()"); +extern void _dyld_lookup_and_bind_with_hint(const char* symbol_name, const char* library_name_hint, void** address, NSModule* module) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.4, "dlsym()"); +extern void _dyld_lookup_and_bind_fully(const char* symbol_name, void** address, NSModule* module) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.1, 10.5, "dlsym()"); -extern const struct mach_header* _dyld_get_image_header_containing_address(const void* address) __API_UNAVAILABLE(ios, tvos, watchos) __attribute__((availability(driverkit,unavailable))) __OSX_DEPRECATED(10.3, 10.5, "dladdr()"); +extern const struct mach_header* _dyld_get_image_header_containing_address(const void* address) __API_UNAVAILABLE(ios, tvos, watchos) /* __attribute__((availability(driverkit,unavailable))) */ __OSX_DEPRECATED(10.3, 10.5, "dladdr()"); #if __cplusplus diff -rup include-10.15/TargetConditionals.h include-10.15-fixed/TargetConditionals.h --- include-10.15/TargetConditionals.h 2019-06-01 22:49:27.000000000 +0000 +++ include-10.15-fixed/TargetConditionals.h 2019-06-10 08:58:13.000000000 +0000 @@ -126,6 +126,8 @@ * It is disabled by default. */ +#include + #if __has_builtin(__is_target_arch) #if __has_builtin(__is_target_vendor) #if __has_builtin(__is_target_os)