pkgs/by-name/zv/zvbi/musl-x86_64.patch

   1 From ae143105863a9b8ecc9e46b91df011360e617f8f Mon Sep 17 00:00:00 2001
   2 From: Alyssa Ross <hi@alyssa.is>
   3 Date: Fri, 20 Dec 2024 16:14:08 +0100
   4 Subject: [PATCH] Use standard va_copy(), not GNU __va_copy()
   5
   6 va_copy() was standardized in C99.  My musl toolchain provides
   7 va_copy(), not __va_copy().  The Glibc documentation recommends
   8 using va_copy() if defined, and otherwise falling back to an
   9 assignment.
  10
  11 Link: https://sourceware.org/glibc/manual/2.40/html_node/Argument-Macros.html#index-va_005fcopy-1
  12 ---
  13  src/export.c | 4 ++--
  14  src/misc.c   | 4 ++--
  15  src/misc.h   | 6 +++---
  16  3 files changed, 7 insertions(+), 7 deletions(-)
  17
  18 diff --git a/src/export.c b/src/export.c
  19 index beb325f..26ae63a 100644
  20 --- a/src/export.c
  21 +++ b/src/export.c
  22 @@ -1472,7 +1472,7 @@ vbi_export_vprintf                (vbi_export *           e,
  23                 return TRUE;
  24         }
  25
  26 -       __va_copy (ap2, ap);
  27 +       va_copy (ap2, ap);
  28
  29         offset = e->buffer.offset;
  30
  31 @@ -1509,7 +1509,7 @@ vbi_export_vprintf                (vbi_export *           e,
  32                 }
  33
  34                 /* vsnprintf() may advance ap. */
  35 -               __va_copy (ap, ap2);
  36 +               va_copy (ap, ap2);
  37         }
  38
  39         _vbi_export_malloc_error (e);
  40 diff --git a/src/misc.c b/src/misc.c
  41 index 834cc89..288f83d 100644
  42 --- a/src/misc.c
  43 +++ b/src/misc.c
  44 @@ -156,7 +156,7 @@ _vbi_vasprintf                      (char **                dstp,
  45         buf = NULL;
  46         size = 64;
  47
  48 -       __va_copy (ap2, ap);
  49 +       va_copy (ap2, ap);
  50
  51         for (;;) {
  52
  53 @@ -183,7 +183,7 @@ _vbi_vasprintf                      (char **                dstp,
  54                 }
  55
  56                 /* vsnprintf() may advance ap. */
  57 -               __va_copy (ap, ap2);
  58 +               va_copy (ap, ap2);
  59         }
  60
  61         vbi_free (buf);
  62 diff --git a/src/misc.h b/src/misc.h
  63 index 107a982..dbe91b8 100644
  64 --- a/src/misc.h
  65 +++ b/src/misc.h
  66 @@ -423,9 +423,9 @@ _vbi_time_max                       (void)
  67  }
  68  #endif
  69
  70 -/* __va_copy is a GNU extension. */
  71 -#ifndef __va_copy
  72 -#  define __va_copy(ap1, ap2) do { ap1 = ap2; } while (0)
  73 +/* va_copy is C99. */
  74 +#ifndef va_copy
  75 +#  define va_copy(ap1, ap2) do { ap1 = ap2; } while (0)
  76  #endif
  77
  78  /* Use this instead of strncpy(). strlcpy() is a BSD extension. */
  79 --
  80 2.47.0
  81