Loading...
include/stdlib.h Libc-1583.60.2 Libc-1158.1.2
--- Libc/Libc-1583.60.2/include/stdlib.h
+++ Libc/Libc-1158.1.2/include/stdlib.h
@@ -59,13 +59,10 @@
 #define _STDLIB_H_
 
 #include <Availability.h>
-#include <sys/cdefs.h>
 
 #include <_types.h>
 #if !defined(_ANSI_SOURCE)
-#ifndef UNIFDEF_DRIVERKIT
 #include <sys/wait.h>
-#endif /* UNIFDEF_DRIVERKIT */
 #if (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
 #include <alloca.h>
 #endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
@@ -101,10 +98,8 @@
 
 #include <sys/_types/_null.h>
 
-#ifndef UNIFDEF_DRIVERKIT
 #define	EXIT_FAILURE	1
 #define	EXIT_SUCCESS	0
-#endif /* UNIFDEF_DRIVERKIT */
 
 #define	RAND_MAX	0x7fffffff
 
@@ -128,17 +123,16 @@
     && defined(_USE_EXTENDED_LOCALES_) && !defined(MB_CUR_MAX_L)
 #define	MB_CUR_MAX_L(x)	(___mb_cur_max_l(x))
 #endif
-
-#ifndef UNIFDEF_DRIVERKIT
-#include <malloc/_malloc.h>
-#endif /* UNIFDEF_DRIVERKIT */
+//Begin-Libc
+#include "libc_private.h"
+/* f must be a literal string */
+#define LIBC_ABORT(f,...)	abort_report_np("%s:%s:%u: " f, __FILE__, __func__, __LINE__, ## __VA_ARGS__)
+//End-Libc
 
 __BEGIN_DECLS
-void	 abort(void) __cold __dead2;
+void	 abort(void) __dead2;
 int	 abs(int) __pure2;
-#ifndef UNIFDEF_DRIVERKIT
 int	 atexit(void (* _Nonnull)(void));
-#endif /* UNIFDEF_DRIVERKIT */
 double	 atof(const char *);
 int	 atoi(const char *);
 long	 atol(const char *);
@@ -148,15 +142,11 @@
 #endif /* !__DARWIN_NO_LONG_LONG */
 void	*bsearch(const void *__key, const void *__base, size_t __nel,
 	    size_t __width, int (* _Nonnull __compar)(const void *, const void *));
-#ifndef UNIFDEF_DRIVERKIT
-/* calloc is now declared in _malloc.h */
-#endif /* UNIFDEF_DRIVERKIT */
+void	*calloc(size_t __count, size_t __size) __result_use_check;
 div_t	 div(int, int) __pure2;
-#ifndef UNIFDEF_DRIVERKIT
 void	 exit(int) __dead2;
-/* free is now declared in _malloc.h */
+void	 free(void *);
 char	*getenv(const char *);
-#endif /* UNIFDEF_DRIVERKIT */
 long	 labs(long) __pure2;
 ldiv_t	 ldiv(long, long) __pure2;
 #if !__DARWIN_NO_LONG_LONG
@@ -164,22 +154,16 @@
 	 llabs(long long);
 lldiv_t	 lldiv(long long, long long);
 #endif /* !__DARWIN_NO_LONG_LONG */
-#ifndef UNIFDEF_DRIVERKIT
-/* malloc is now declared in _malloc.h */
-#endif /* UNIFDEF_DRIVERKIT */
+void	*malloc(size_t __size) __result_use_check;
 int	 mblen(const char *__s, size_t __n);
 size_t	 mbstowcs(wchar_t * __restrict , const char * __restrict, size_t);
 int	 mbtowc(wchar_t * __restrict, const char * __restrict, size_t);
-#ifndef UNIFDEF_DRIVERKIT
-/* posix_memalign is now declared in _malloc.h */
-#endif /* UNIFDEF_DRIVERKIT */
+int 	 posix_memalign(void **__memptr, size_t __alignment, size_t __size) __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_0);
 void	 qsort(void *__base, size_t __nel, size_t __width,
 	    int (* _Nonnull __compar)(const void *, const void *));
-#ifndef UNIFDEF_DRIVERKIT
 int	 rand(void) __swift_unavailable("Use arc4random instead.");
-/* realloc is now declared in _malloc.h */
+void	*realloc(void *__ptr, size_t __size) __result_use_check;
 void	 srand(unsigned) __swift_unavailable("Use arc4random instead.");
-#endif /* UNIFDEF_DRIVERKIT */
 double	 strtod(const char *, char **) __DARWIN_ALIAS(strtod);
 float	 strtof(const char *, char **) __DARWIN_ALIAS(strtof);
 long	 strtol(const char *__str, char **__endptr, int __base);
@@ -195,13 +179,18 @@
 unsigned long long
 	 strtoull(const char *__str, char **__endptr, int __base);
 #endif /* !__DARWIN_NO_LONG_LONG */
-#ifndef UNIFDEF_DRIVERKIT
 //Begin-Libc
 #ifndef LIBC_ALIAS_SYSTEM
 //End-Libc
 
-__swift_unavailable("Use posix_spawn APIs or NSTask instead. (On iOS, process spawning is unavailable.)")
-__API_AVAILABLE(macos(10.0)) __IOS_PROHIBITED
+#if TARGET_OS_EMBEDDED
+#define __swift_unavailable_on(osx_msg, ios_msg) __swift_unavailable(ios_msg)
+#else
+#define __swift_unavailable_on(osx_msg, ios_msg) __swift_unavailable(osx_msg)
+#endif
+
+__swift_unavailable_on("Use posix_spawn APIs or NSTask instead.", "Process spawning is unavailable")
+__OSX_AVAILABLE_BUT_DEPRECATED_MSG(__MAC_10_0,__MAC_NA,__IPHONE_2_0,__IPHONE_8_0, "Use posix_spawn APIs instead.")
 __WATCHOS_PROHIBITED __TVOS_PROHIBITED
 int	 system(const char *) __DARWIN_ALIAS_C(system);
 //Begin-Libc
@@ -210,12 +199,11 @@
 #endif /* !LIBC_ALIAS_SYSTEM */
 //End-Libc
 
-#endif /* UNIFDEF_DRIVERKIT */
+#undef __swift_unavailable_on
 
 size_t	 wcstombs(char * __restrict, const wchar_t * __restrict, size_t);
 int	 wctomb(char *, wchar_t);
 
-#ifndef UNIFDEF_DRIVERKIT
 #ifndef _ANSI_SOURCE
 void	_Exit(int) __dead2;
 long	 a64l(const char *);
@@ -235,20 +223,12 @@
 char	*l64a(long);
 void	 lcong48(unsigned short[7]);
 long	 lrand48(void) __swift_unavailable("Use arc4random instead.");
-#if !defined(_POSIX_C_SOURCE)
-__deprecated_msg("This function is provided for compatibility reasons only.  Due to security concerns inherent in the design of mktemp(3), it is highly recommended that you use mkstemp(3) instead.")
-#endif
 char	*mktemp(char *);
 int	 mkstemp(char *);
 long	 mrand48(void) __swift_unavailable("Use arc4random instead.");
 long	 nrand48(unsigned short[3]) __swift_unavailable("Use arc4random instead.");
 int	 posix_openpt(int);
 char	*ptsname(int);
-
-#if (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-int ptsname_r(int fildes, char *buffer, size_t buflen) __API_AVAILABLE(macos(10.13.4), ios(11.3), tvos(11.3), watchos(4.3));
-#endif
-
 //Begin-Libc
 #ifndef LIBC_ALIAS_PUTENV
 //End-Libc
@@ -327,48 +307,30 @@
 void	 unsetenv(const char *);
 #endif /* __DARWIN_UNIX03 */
 #endif	/* !_ANSI_SOURCE */
-#endif /* UNIFDEF_DRIVERKIT */
-__END_DECLS
 
 #if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
 #include <machine/types.h>
-#ifndef UNIFDEF_DRIVERKIT
+
 #include <sys/_types/_dev_t.h>
 #include <sys/_types/_mode_t.h>
-#endif /* UNIFDEF_DRIVERKIT */
 #include <_types/_uint32_t.h>
 
-__BEGIN_DECLS
 uint32_t arc4random(void);
-#ifndef UNIFDEF_DRIVERKIT
 void	 arc4random_addrandom(unsigned char * /*dat*/, int /*datlen*/)
     __OSX_DEPRECATED(10.0, 10.12, "use arc4random_stir")
     __IOS_DEPRECATED(2.0, 10.0, "use arc4random_stir")
     __TVOS_DEPRECATED(2.0, 10.0, "use arc4random_stir")
     __WATCHOS_DEPRECATED(1.0, 3.0, "use arc4random_stir");
-#endif /* UNIFDEF_DRIVERKIT */
 void	 arc4random_buf(void * __buf, size_t __nbytes) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
 void	 arc4random_stir(void);
 uint32_t
 	 arc4random_uniform(uint32_t __upper_bound) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
 #ifdef __BLOCKS__
-#ifndef UNIFDEF_DRIVERKIT
 int	 atexit_b(void (^ _Nonnull)(void)) __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
-#endif /* UNIFDEF_DRIVERKIT */
-
-#ifdef __BLOCKS__
-#if __has_attribute(noescape)
-#define __bsearch_noescape __attribute__((__noescape__))
-#else
-#define __bsearch_noescape
-#endif
+void	*bsearch_b(const void *__key, const void *__base, size_t __nel,
+	    size_t __width, int (^ _Nonnull __compar)(const void *, const void *)) __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
 #endif /* __BLOCKS__ */
-void	*bsearch_b(const void *__key, const void *__base, size_t __nel,
-	    size_t __width, int (^ _Nonnull __compar)(const void *, const void *) __bsearch_noescape)
-	    __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
-#endif /* __BLOCKS__ */
-
-#ifndef UNIFDEF_DRIVERKIT
+
 	 /* getcap(3) functions */
 char	*cgetcap(char *, const char *, int);
 int	 cgetclose(void);
@@ -388,79 +350,51 @@
 int	 getloadavg(double [], int);
 const char
 	*getprogname(void);
-void	 setprogname(const char *);
-#endif /* UNIFDEF_DRIVERKIT */
-
-#ifdef __BLOCKS__
-#if __has_attribute(noescape)
-#define __sort_noescape __attribute__((__noescape__))
-#else
-#define __sort_noescape
-#endif
-#endif /* __BLOCKS__ */
 
 int	 heapsort(void *__base, size_t __nel, size_t __width,
 	    int (* _Nonnull __compar)(const void *, const void *));
 #ifdef __BLOCKS__
 int	 heapsort_b(void *__base, size_t __nel, size_t __width,
-	    int (^ _Nonnull __compar)(const void *, const void *) __sort_noescape)
-	    __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
+	    int (^ _Nonnull __compar)(const void *, const void *)) __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
 #endif /* __BLOCKS__ */
 int	 mergesort(void *__base, size_t __nel, size_t __width,
 	    int (* _Nonnull __compar)(const void *, const void *));
 #ifdef __BLOCKS__
 int	 mergesort_b(void *__base, size_t __nel, size_t __width,
-	    int (^ _Nonnull __compar)(const void *, const void *) __sort_noescape)
-	    __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
+	    int (^ _Nonnull __compar)(const void *, const void *)) __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
 #endif /* __BLOCKS__ */
-#ifndef UNIFDEF_DRIVERKIT
 void	 psort(void *__base, size_t __nel, size_t __width,
-	    int (* _Nonnull __compar)(const void *, const void *))
-	    __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
+	    int (* _Nonnull __compar)(const void *, const void *)) __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
 #ifdef __BLOCKS__
 void	 psort_b(void *__base, size_t __nel, size_t __width,
-	    int (^ _Nonnull __compar)(const void *, const void *) __sort_noescape)
-	    __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
+	    int (^ _Nonnull __compar)(const void *, const void *)) __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
 #endif /* __BLOCKS__ */
 void	 psort_r(void *__base, size_t __nel, size_t __width, void *,
-	    int (* _Nonnull __compar)(void *, const void *, const void *))
-	    __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
-#endif /* UNIFDEF_DRIVERKIT */
+	    int (* _Nonnull __compar)(void *, const void *, const void *))  __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
 #ifdef __BLOCKS__
 void	 qsort_b(void *__base, size_t __nel, size_t __width,
-	    int (^ _Nonnull __compar)(const void *, const void *) __sort_noescape)
-	    __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
+	    int (^ _Nonnull __compar)(const void *, const void *)) __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
 #endif /* __BLOCKS__ */
 void	 qsort_r(void *__base, size_t __nel, size_t __width, void *,
 	    int (* _Nonnull __compar)(void *, const void *, const void *));
 int	 radixsort(const unsigned char **__base, int __nel, const unsigned char *__table,
 	    unsigned __endbyte);
-int	rpmatch(const char *)
-	__API_AVAILABLE(macos(10.15), ios(13.0), tvos(13.0), watchos(6.0));
+void	 setprogname(const char *);
 int	 sradixsort(const unsigned char **__base, int __nel, const unsigned char *__table,
 	    unsigned __endbyte);
-#ifndef UNIFDEF_DRIVERKIT
 void	 sranddev(void);
 void	 srandomdev(void);
-void	*reallocf(void *__ptr, size_t __size) __alloc_size(2);
-long long
-	strtonum(const char *__numstr, long long __minval, long long __maxval, const char **__errstrp)
-	__API_AVAILABLE(macos(10.16), ios(14.0), tvos(14.0), watchos(7.0));
-#endif /* UNIFDEF_DRIVERKIT */
+void	*reallocf(void *__ptr, size_t __size);
 #if !__DARWIN_NO_LONG_LONG
 long long
 	 strtoq(const char *__str, char **__endptr, int __base);
 unsigned long long
 	 strtouq(const char *__str, char **__endptr, int __base);
 #endif /* !__DARWIN_NO_LONG_LONG */
-#ifndef UNIFDEF_DRIVERKIT
 extern char *suboptarg;		/* getsubopt(3) external variable */
-/* valloc is now declared in _malloc.h */
-#endif /* UNIFDEF_DRIVERKIT */
-__END_DECLS
+void	*valloc(size_t);
 #endif	/* !_ANSI_SOURCE && !_POSIX_SOURCE */
 
-__BEGIN_DECLS
 /* Poison the following routines if -fshort-wchar is set */
 #if !defined(__cplusplus) && defined(__WCHAR_MAX__) && __WCHAR_MAX__ <= 0xffffU
 #pragma GCC poison mbstowcs mbtowc wcstombs wctomb