2b0cd7cceb
Rebased on top of Martin Wilck's queue of ACKed upstream commits * https://github.com/openSUSE/multipath-tools/tree/upstream-queue * All previous patches have been reordered, with the exception of 0011-libdmmp-Add-support-for-upcoming-json-c-0.14.0.patch which has been replaced with 0029-fix-boolean-value-with-json-c-0.14.patch Modify 0054-RH-add-mpathconf.patch * remove default enable_foreign and property blacklist_exceptions settings, and deal with the builtin default change from 0031-libmultipath-set-enable_foreign-to-NONE-by-default.patch. Fixes bz #1853668 Add 0048-Makefile.inc-trim-extra-information-from-systemd-ver.patch Add 0049-kpartx-fix-Wsign-compare-error.patch * The above two patches have been submitted upstream
27 lines
863 B
Diff
27 lines
863 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Fri, 25 Jan 2019 14:54:56 -0600
|
|
Subject: [PATCH] RH: Fix nvme compilation warning
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/nvme/argconfig.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/libmultipath/nvme/argconfig.h b/libmultipath/nvme/argconfig.h
|
|
index adb192b6..bfd10ef8 100644
|
|
--- a/libmultipath/nvme/argconfig.h
|
|
+++ b/libmultipath/nvme/argconfig.h
|
|
@@ -76,7 +76,7 @@ struct argconfig_commandline_options {
|
|
extern "C" {
|
|
#endif
|
|
|
|
-typedef void argconfig_help_func();
|
|
+typedef void argconfig_help_func(void);
|
|
void argconfig_append_usage(const char *str);
|
|
void argconfig_print_help(const char *program_desc,
|
|
const struct argconfig_commandline_options *options);
|
|
--
|
|
2.17.2
|
|
|