Author: pfg
Date: Mon Sep 1 22:25:42 2014
New Revision: 270952
URL: http://svnweb.freebsd.org/changeset/base/270952
Log:
Add bsearch_b to the libc map and the stdlib header.
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
Modified:
head/include/stdlib.h
head/lib/libc/stdlib/Symbol.map
Modified: head/include/stdlib.h
==============================================================================
--- head/include/stdlib.h Mon Sep 1 20:18:09 2014 (r270951)
+++ head/include/stdlib.h Mon Sep 1 22:25:42 2014 (r270952)
@@ -82,9 +82,6 @@ extern int ___mb_cur_max(void);
_Noreturn void abort(void);
int abs(int) __pure2;
int atexit(void (*)(void));
-#ifdef __BLOCKS__
-int atexit_b(void (^)(void));
-#endif
double atof(const char *);
int atoi(const char *);
long atol(const char *);
@@ -103,10 +100,6 @@ size_t mbstowcs(wchar_t * __restrict ,
int mbtowc(wchar_t * __restrict, const char * __restrict, size_t);
void qsort(void *, size_t, size_t,
int (*)(const void *, const void *));
-#ifdef __BLOCKS__
-void qsort_b(void *, size_t, size_t,
- int (^)(const void *, const void *));
-#endif
int rand(void);
void *realloc(void *, size_t);
void srand(unsigned);
@@ -264,6 +257,11 @@ void arc4random_buf(void *, size_t);
void arc4random_stir(void);
__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 *);
/* getcap(3) functions */
char *cgetcap(char *, const char *, int);
@@ -289,6 +287,8 @@ const char *
int heapsort(void *, size_t, size_t, int (*)(const void *, const void *));
#ifdef __BLOCKS__
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
int l64a_r(long, char *, int);
int mergesort(void *, size_t, size_t, int (*)(const void *, const void *));
Modified: head/lib/libc/stdlib/Symbol.map
==============================================================================
--- head/lib/libc/stdlib/Symbol.map Mon Sep 1 20:18:09 2014
(r270951)
+++ head/lib/libc/stdlib/Symbol.map Mon Sep 1 22:25:42 2014
(r270952)
@@ -106,6 +106,7 @@ FBSD_1.3 {
FBSD_1.4 {
atexit_b;
+ bsearch_b;
heapsort_b;
mergesort_b;
qsort_b;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
