commit af0ad77af5fc2a4f39fa29b4e6720898d92fb2b4
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 16 15:34:14 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 16 15:34:14 2018 +0000
tree 5b4352c5e0ddacfac7785f290f08a7535b0631ad
parent 9ee88bdbc792c510c71e313829263ba0ae0622f7
parent 00a6d5fe0ab034e4d5e87636456cd49ef0ca5b8d

Merge "Bionic: Always use fortified versions of FD_X macros"

libc/bionic/sched_cpucount.c

diff --git a/libc/bionic/sched_cpucount.c b/libc/bionic/sched_cpucount.c
index 2ea1d3f..6f66589 100644
--- a/libc/bionic/sched_cpucount.c
+++ b/libc/bionic/sched_cpucount.c
@@ -28,7 +28,7 @@
 #define _GNU_SOURCE 1
 #include <sched.h>
 
-int __sched_cpucount(size_t setsize, cpu_set_t* set) {
+int __sched_cpucount(size_t setsize, const cpu_set_t* set) {
   int nn = 0;
   int nn_max = setsize / sizeof(__CPU_BITTYPE);
   int count = 0;

libc/include/android/dlext.h

diff --git a/libc/include/android/dlext.h b/libc/include/android/dlext.h
index 2b4169e..d0200c4 100644
--- a/libc/include/android/dlext.h
+++ b/libc/include/android/dlext.h
@@ -24,6 +24,11 @@
 #include <sys/types.h>  /* for off64_t */
 
 /**
+ * @addtogroup libdl Dynamic Linker
+ * @{
+ */
+
+/**
  * \file
  * Advanced dynamic library opening support. Most users will want to use
  * the standard [dlopen(3)](http://man7.org/linux/man-pages/man3/dlopen.3.html)
@@ -179,4 +184,6 @@
 
 __END_DECLS
 
+/** @} */
+
 #endif

libc/include/sched.h

diff --git a/libc/include/sched.h b/libc/include/sched.h
index de6969f8..1f50366 100644
--- a/libc/include/sched.h
+++ b/libc/include/sched.h
@@ -143,7 +143,7 @@
 
 #define CPU_COUNT_S(setsize, set)  __sched_cpucount((setsize), (set))
 
-int __sched_cpucount(size_t __set_size, cpu_set_t* __set) __INTRODUCED_IN(12);
+int __sched_cpucount(size_t __set_size, const cpu_set_t* __set) __INTRODUCED_IN(12);
 
 #endif /* __USE_GNU */