commit: 5c1bfc0adcc93d7033404ca77a507e2f3be88fc7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Feb 6 22:25:13 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Feb 6 22:25:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c1bfc0a
sys-fs/autorun: add missing includes Bug: https://bugs.gentoo.org/714140 Closes: https://bugs.gentoo.org/875851 Closes: https://bugs.gentoo.org/877125 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-fs/autorun/files/autorun-3.17-headers.patch | 44 ++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/sys-fs/autorun/files/autorun-3.17-headers.patch b/sys-fs/autorun/files/autorun-3.17-headers.patch index 4fc487d656b3..113367305af0 100644 --- a/sys-fs/autorun/files/autorun-3.17-headers.patch +++ b/sys-fs/autorun/files/autorun-3.17-headers.patch @@ -1,5 +1,6 @@ https://bugs.gentoo.org/251684 - +https://bugs.gentoo.org/875851 +https://bugs.gentoo.org/877125 --- a/autorun.cc +++ b/autorun.cc @@ -90,6 +90,8 @@ char *strchr (), *strrchr (); @@ -11,3 +12,44 @@ https://bugs.gentoo.org/251684 #ifndef MNTTYPE_ISO9660 #define MNTTYPE_ISO9660 "iso9660" #endif +--- a/autorun.cc ++++ b/autorun.cc +@@ -26,20 +26,6 @@ + #define HAVE_ARGP + #endif + +-#if STDC_HEADERS +-# include <string.h> +-#else +-# if !HAVE_STRCHR +-# define strchr index +-# define strrchr rindex +-# endif +-char *strchr (), *strrchr (); +-# if !HAVE_MEMCPY +-# define memcpy(d, s, n) bcopy ((s), (d), (n)) +-# define memmove(d, s, n) bcopy ((s), (d), (n)) +-# endif +-#endif +- + #include <sys/types.h> + #if HAVE_SYS_WAIT_H + # include <sys/wait.h> +@@ -78,6 +64,8 @@ char *strchr (), *strrchr (); + #include <stdarg.h> + #include <mntent.h> + #include "cdrom.h" ++#include <cstring> ++#include <climits> + #include <list> + #include <iostream> + #include <libintl.h> +@@ -88,7 +76,7 @@ char *strchr (), *strrchr (); + #include <getopt.h> + #endif + +-#include <errno.h> ++#include <cerrno> + + #include <stdlib.h> +
