mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
945e3017cf
Closes: https://bugs.gentoo.org/945968 Thanks-to: Bobby Bingham <koorogi@koorogi.info> Signed-off-by: Sam James <sam@gentoo.org>
59 lines
1.7 KiB
Diff
59 lines
1.7 KiB
Diff
From 31bc8976fb7bfdde8b9293e6a4eb2becb29a73bc Mon Sep 17 00:00:00 2001
|
|
From: Bobby Bingham <koorogi@koorogi.info>
|
|
Date: Wed, 2 Jul 2025 18:09:28 -0500
|
|
Subject: [PATCH] fix compilation on musl with gcc15
|
|
|
|
---
|
|
lib/fnmatch.c | 2 +-
|
|
src/getopt.c | 2 +-
|
|
src/getopt.h | 7 -------
|
|
3 files changed, 2 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/lib/fnmatch.c b/lib/fnmatch.c
|
|
index 01da376..9b54022 100644
|
|
--- a/lib/fnmatch.c
|
|
+++ b/lib/fnmatch.c
|
|
@@ -121,7 +121,7 @@ USA. */
|
|
whose names are inconsistent. */
|
|
|
|
# if !defined _LIBC && !defined getenv
|
|
-extern char *getenv ();
|
|
+extern char *getenv (const char*);
|
|
# endif
|
|
|
|
# ifndef errno
|
|
diff --git a/src/getopt.c b/src/getopt.c
|
|
index 7a792de..9b56abe 100644
|
|
--- a/src/getopt.c
|
|
+++ b/src/getopt.c
|
|
@@ -202,7 +202,7 @@ static char *posixly_correct;
|
|
whose names are inconsistent. */
|
|
|
|
#ifndef getenv
|
|
-extern char *getenv ();
|
|
+extern char *getenv (const char*);
|
|
#endif
|
|
|
|
static char *
|
|
diff --git a/src/getopt.h b/src/getopt.h
|
|
index df18cee..a6cc621 100644
|
|
--- a/src/getopt.h
|
|
+++ b/src/getopt.h
|
|
@@ -96,14 +96,7 @@ struct option
|
|
#define optional_argument 2
|
|
|
|
#if defined (__STDC__) && __STDC__
|
|
-#ifdef __GNU_LIBRARY__
|
|
-/* Many other libraries have conflicting prototypes for getopt, with
|
|
- differences in the consts, in stdlib.h. To avoid compilation
|
|
- errors, only prototype getopt for the GNU C library. */
|
|
extern int getopt (int argc, char *const *argv, const char *shortopts);
|
|
-#else /* not __GNU_LIBRARY__ */
|
|
-extern int getopt ();
|
|
-#endif /* __GNU_LIBRARY__ */
|
|
extern int getopt_long (int argc, char *const *argv, const char *shortopts,
|
|
const struct option *longopts, int *longind);
|
|
extern int getopt_long_only (int argc, char *const *argv,
|
|
--
|
|
2.50.0
|