Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e40676f1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "osi: compat: fix build with glibc >= 2.38" into main am: 76c0f5ec am: 481133c6 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3169352



Change-Id: I36f47319fc27fd8c95f15aca93711ca65409751f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a151a07 481133c6

system/osi/include/compat.h

+3 −0
Original line number Diff line number Diff line
@@ -28,7 +28,10 @@ 
/* Get thread identification. */

pid_t gettid(void) throw();



/* glibc>=2.38 supplies its own strlcpy which conflicts with this declaration */

#if !(__GLIBC_PREREQ(2, 38))

/* Copy src to string dst of size siz. */

size_t strlcpy(char* dst, const char* src, size_t siz);

#endif /* !(__GLIBC_PREREQ(2, 38)) */



#endif

system/osi/src/compat.cc

+6 −3
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 


#if __GLIBC__

pid_t gettid(void) throw() { return syscall(SYS_gettid); }

#endif



/* These functions from bionic

 *
@@ -56,7 +55,10 @@ pid_t gettid(void) throw() { return syscall(SYS_gettid); } 
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#if __GLIBC__

/*

 * Glibc added strlcpy() starting with 2.38, so skip it if glibc >= 2.38.

 */

#if !(__GLIBC_PREREQ(2, 38))

/*

 * Copy src to string dst of size siz.  At most siz-1 characters

 * will be copied.  Always NUL terminates (unless siz == 0).
@@ -87,4 +89,5 @@ size_t strlcpy(char* dst, const char* src, size_t siz) { 


  return s - src - 1; /* count does not include NUL */

}

#endif
 
#endif /* !(__GLIBC_PREREQ(2, 38)) */

#endif /* __GLIBC__ */