| Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame] | 1 | From e9ed48d91642d384ce07cbb9bec788f07fc6354c Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 6 Sep 2022 14:51:42 -0700 |
| 4 | Subject: [PATCH] tftp: Remove double inclusion of signal.h |
| 5 | |
| 6 | Undefine __USE_XOPEN2K8 so we can get bsd_signal definition from system |
| 7 | headers |
| 8 | |
| 9 | Upstream-Status: Pending |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | config.h | 4 +++- |
| 13 | 1 file changed, 3 insertions(+), 1 deletion(-) |
| 14 | |
| 15 | diff --git a/config.h b/config.h |
| 16 | index 3ff2915..ae1a14b 100644 |
| 17 | --- a/config.h |
| 18 | +++ b/config.h |
| 19 | @@ -93,7 +93,6 @@ |
| 20 | #endif |
| 21 | |
| 22 | #include <errno.h> |
| 23 | -#include <signal.h> |
| 24 | |
| 25 | #ifdef HAVE_SYS_SOCKET_H |
| 26 | #include <sys/socket.h> |
| 27 | @@ -296,6 +295,9 @@ char *xstrdup(const char *); |
| 28 | |
| 29 | #ifndef HAVE_BSD_SIGNAL |
| 30 | void (*bsd_signal(int, void (*)(int))) (int); |
| 31 | +#else |
| 32 | +#undef __USE_XOPEN2K8 |
| 33 | +#include <signal.h> |
| 34 | #endif |
| 35 | #ifndef HAVE_DUP2 |
| 36 | int dup2(int, int); |
| 37 | -- |
| 38 | 2.37.3 |
| 39 | |