]> git.alsa-project.org Git - alsa-utils.git/commitdiff
alsactl: add define to compile with glibc 2.38
authorRudi Heitbaum <rudi@heitbaum.com>
Sat, 22 Jul 2023 15:36:09 +0000 (15:36 +0000)
committerJaroslav Kysela <perex@perex.cz>
Tue, 1 Aug 2023 07:36:04 +0000 (09:36 +0200)
strlcat and strlcpy have been added to glibc 2.38.
update the defines to use the glibc versions, and not conflict with
string.h.

ref:
- https://sourceware.org/git/?p=glibc.git;a=commit;h=454a20c8756c9c1d55419153255fc7692b3d2199

Fixes: https://github.com/alsa-project/alsa-utils/pull/225
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
alsactl/init_sysdeps.c

index 3aca1b4aeef26f5e7648b152dd895fdaec202a7e..f09b1aed73ef3a83f651ca8272568edb8f0d4936 100644 (file)
@@ -18,6 +18,7 @@
  */
 
 #if defined(__GLIBC__) && !(defined(__UCLIBC__) && defined(__USE_BSD))
+#if !(__GLIBC_PREREQ(2, 38))
 static size_t strlcpy(char *dst, const char *src, size_t size)
 {
        size_t bytes = 0;
@@ -60,4 +61,5 @@ static size_t strlcat(char *dst, const char *src, size_t size)
        *q = '\0';
        return bytes;
 }
+#endif /* !(__GLIBC_PREREQ(2, 38)) */
 #endif /* __GLIBC__ */