| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | rpmpgp.h: We do not require the popt header in order to use rpmpgp functions |
| 2 | |
| 3 | This can cause failures if the internal libpopt is used, as it's header is |
| 4 | not exported. |
| 5 | |
| 6 | Upstream-Status: Pending |
| 7 | |
| 8 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 9 | |
| 10 | Index: rpm-5.4.14/rpmio/rpmpgp.h |
| 11 | =================================================================== |
| 12 | --- rpm-5.4.14.orig/rpmio/rpmpgp.h |
| 13 | +++ rpm-5.4.14/rpmio/rpmpgp.h |
| 14 | @@ -11,11 +11,11 @@ |
| 15 | */ |
| 16 | |
| 17 | #include <string.h> |
| 18 | -#include <popt.h> |
| 19 | #include <rpmiotypes.h> |
| 20 | #include <yarn.h> |
| 21 | |
| 22 | #if defined(_RPMPGP_INTERNAL) |
| 23 | +#include <popt.h> |
| 24 | #include <rpmsw.h> |
| 25 | |
| 26 | /*@unchecked@*/ |