#194: redefinition warnings, invalid type in doveadm-rbox command

ceph-dovecot · Oct 25, 2018 · 33a5f8e · 33a5f8e
1 parent 3b6db40
commit 33a5f8e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/src/librmb/tools/rmb/rmb.cpp b/src/librmb/tools/rmb/rmb.cpp
@@ -36,6 +36,12 @@
 #include "rados-dovecot-ceph-cfg-impl.h"
 #include "rados-metadata-storage-default.h"
 #include "rmb-commands.h"
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_URL
+#undef PACKAGE_VERSION
 #include "config-local.h"
 
 static void argv_to_vec(int argc, const char **argv, std::vector<const char *> *args) {

diff --git a/src/storage-rbox/debug-helper.h b/src/storage-rbox/debug-helper.h
@@ -8,6 +8,13 @@
  * License version 2.1, as published by the Free Software
  * Foundation.  See file COPYING.
  */
+
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_URL
+#undef PACKAGE_VERSION
 #include "config-local.h"
 #ifndef SRC_STORAGE_RBOX_DEBUG_HELPER_H_
 #define SRC_STORAGE_RBOX_DEBUG_HELPER_H_

diff --git a/src/storage-rbox/doveadm-rbox-plugin.cpp b/src/storage-rbox/doveadm-rbox-plugin.cpp
@@ -9,14 +9,15 @@
  * License version 2.1, as published by the Free Software
  * Foundation.  See file COPYING.
  */
+
 #include <algorithm>
 #include <list>
 #include <map>
 #include <string>
 #include <vector>
 
 extern "C" {
-#include "config-local.h"
+
 #include "lib.h"
 #include "module-dir.h"
 #include "str.h"
@@ -36,6 +37,14 @@ extern "C" {
 #include "doveadm-cmd.h"
 #include "istream.h"
 #include "doveadm-print.h"
+
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_URL
+#undef PACKAGE_VERSION
+#include "config-local.h"
 }
 
 #include "tools/rmb/rmb-commands.h"

diff --git a/src/storage-rbox/doveadm-rbox.c b/src/storage-rbox/doveadm-rbox.c
@@ -36,11 +36,11 @@ static struct doveadm_mail_cmd rmb_commands[] = {
     {cmd_rmb_check_indices_alloc, "rmb check indices", "-d"},
     {cmd_rmb_mailbox_delete_alloc, "rmb mailbox delete", "-r <mailbox> [...]"}};
 
-struct doveadm_cmd doveadm_cmd_rbox[] = {{cmd_rmb_config_show, "rmb config show", NULL},
-                                         {cmd_rmb_config_create, "rmb config create", NULL},
-                                         {cmd_rmb_config_update, "rmb config update", "key=value"},
-                                         {cmd_rmb_lspools, "rmb lspools", ""},
-                                         {cmd_rmb_version, "rmb version", ""}};
+struct doveadm_cmd doveadm_cmd_rbox[] = {{(void *)cmd_rmb_config_show, "rmb config show", NULL},
+                                         {(void *)cmd_rmb_config_create, "rmb config create", NULL},
+                                         {(void *)cmd_rmb_config_update, "rmb config update", "key=value"},
+                                         {(void *)cmd_rmb_lspools, "rmb lspools", ""},
+                                         {(void *)cmd_rmb_version, "rmb version", ""}};
 
 void doveadm_rbox_plugin_init(struct module *module ATTR_UNUSED) {
   unsigned int i;