[Pkg-samba-maint] [Git][samba-team/samba][master] inline-getprogname.diff: fixup

[Michael Tokarev (@mjt)]

Michael Tokarev pushed to branch master at Debian Samba Team / samba


Commits:
76a64322 by Michael Tokarev at 2026-01-21T18:27:56+03:00
inline-getprogname.diff: fixup

- - - - -


1 changed file:

- debian/patches/inline-getprogname.diff


Changes:

=====================================
debian/patches/inline-getprogname.diff
=====================================
@@ -14,8 +14,8 @@ should clean up #ifdef'fery in replace.c.
 diff --git a/lib/replace/replace.c b/lib/replace/replace.c
 --- a/lib/replace/replace.c
 +++ b/lib/replace/replace.c
-@@ -1145,5 +1145,5 @@ void *rep_memset_explicit(void *block, int c, size_t size)
- #endif
+@@ -984,5 +984,5 @@ int rep_memset_s(void *dest, size_t destsz, int ch, size_t count)
+ #endif /* HAVE_MEMSET_S */
  
 -#ifndef HAVE_GETPROGNAME
 +#if !defined(HAVE_GETPROGNAME) && !defined(HAVE_PROGRAM_INVOCATION_SHORT_NAME)
@@ -24,7 +24,7 @@ diff --git a/lib/replace/replace.c b/lib/replace/replace.c
 diff --git a/lib/replace/replace.h b/lib/replace/replace.h
 --- a/lib/replace/replace.h
 +++ b/lib/replace/replace.h
-@@ -997,7 +997,11 @@ void *rep_memset_explicit(void *block, int c, size_t size);
+@@ -997,7 +997,11 @@ int rep_memset_s(void *dest, size_t destsz, int ch, size_t count);
  
  #ifndef HAVE_GETPROGNAME
 +#ifdef HAVE_PROGRAM_INVOCATION_SHORT_NAME



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/commit/76a64322fc5543d6199397b70d442cc06f22bed4

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/commit/76a64322fc5543d6199397b70d442cc06f22bed4
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20260121/5e450055/attachment-0001.htm>