d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add bsearch_b to the libc map and the stdlib header.

Browse Source 
bsearch_b is the Apple blocks enabled version of bsearch(3).
This was added to libc in Revision 264042 but the commit
missed the declaration required to make use of it.

While here move some other block-related functions to the
BSD_VISIBLE block as these are non-standard.

Phabric:	D638
Reviewed by:	theraven, wollman
This commit is contained in:
Pedro F. Giffuni 2014-09-01 22:25:42 +00:00
parent 13b7412dad
commit f4189cd649
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=270952
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/stdlib.h
View File

@ -82,9 +82,6 @@ extern int ___mb_cur_max(void);
_Noreturn void abort(void); _Noreturn void abort(void);
int abs(int) __pure2; int abs(int) __pure2;
int atexit(void (*)(void)); int atexit(void (*)(void));
#ifdef __BLOCKS__
int atexit_b(void (^)(void));
#endif
double atof(const char *); double atof(const char *);
int atoi(const char *); int atoi(const char *);
long atol(const char *); long atol(const char *);
@ -103,10 +100,6 @@ size_t mbstowcs(wchar_t * __restrict , const char * __restrict, size_t);
int mbtowc(wchar_t * __restrict, const char * __restrict, size_t); int mbtowc(wchar_t * __restrict, const char * __restrict, size_t);
void qsort(void *, size_t, size_t, void qsort(void *, size_t, size_t,
int (*)(const void *, const void *)); int (*)(const void *, const void *));
#ifdef __BLOCKS__
void qsort_b(void *, size_t, size_t,
int (^)(const void *, const void *));
#endif
int rand(void); int rand(void);
void *realloc(void *, size_t); void *realloc(void *, size_t);
void srand(unsigned); void srand(unsigned);
@ -264,6 +257,11 @@ void arc4random_buf(void *, size_t);
void arc4random_stir(void); void arc4random_stir(void);
__uint32_t __uint32_t
arc4random_uniform(__uint32_t); arc4random_uniform(__uint32_t);
#ifdef __BLOCKS__
int atexit_b(void (^)(void));
void *bsearch_b(const void *, const void *, size_t,
size_t, int (^)(const void *, const void *));
#endif
char *getbsize(int *, long *); char *getbsize(int *, long *);
/* getcap(3) functions */ /* getcap(3) functions */
char *cgetcap(char *, const char *, int); char *cgetcap(char *, const char *, int);
@ -289,6 +287,8 @@ const char *
int heapsort(void *, size_t, size_t, int (*)(const void *, const void *)); int heapsort(void *, size_t, size_t, int (*)(const void *, const void *));
#ifdef __BLOCKS__ #ifdef __BLOCKS__
int heapsort_b(void *, size_t, size_t, int (^)(const void *, const void *)); int heapsort_b(void *, size_t, size_t, int (^)(const void *, const void *));
void qsort_b(void *, size_t, size_t,
int (^)(const void *, const void *));
#endif #endif
int l64a_r(long, char *, int); int l64a_r(long, char *, int);
int mergesort(void *, size_t, size_t, int (*)(const void *, const void *)); int mergesort(void *, size_t, size_t, int (*)(const void *, const void *));

1
lib/libc/stdlib/Symbol.map
View File

@ -106,6 +106,7 @@ FBSD_1.3 {
FBSD_1.4 { FBSD_1.4 {
atexit_b; atexit_b;
bsearch_b;
heapsort_b; heapsort_b;
mergesort_b; mergesort_b;
qsort_b; qsort_b;