From 366e3d3353151d99e2a5bd07fbed67e504407ba5 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 8 Sep 2015 10:48:57 -0600
Subject: [PATCH] Eliminate warnings

---
 configs          | 2 +-
 tools/mkconfig.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configs b/configs
index ba2b1db6db4..02a07e4dfc9 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit ba2b1db6db4cd8f44047f5817233a922ee69343e
+Subproject commit 02a07e4dfc9a5e04a2aeb57f4bd89e80285e2bbc
diff --git a/tools/mkconfig.c b/tools/mkconfig.c
index db93b709d7f..038ad5fadaf 100644
--- a/tools/mkconfig.c
+++ b/tools/mkconfig.c
@@ -209,12 +209,12 @@ int main(int argc, char **argv, char **envp)
   printf("/* If the maximum message size is zero, then we assume that message queues\n");
   printf(" * support should be disabled\n");
   printf(" */\n\n");
-  printf("#ifndef CONFIG_MQ_MAXMSGSIZE)\n");
-  printf("# define CONFIG_DISABLE_MQUEUE 0\n");
+  printf("#if !defined(CONFIG_MQ_MAXMSGSIZE) || defined(CONFIG_DISABLE_MQUEUE)\n");
+  printf("# undef CONFIG_MQ_MAXMSGSIZE\n");
+  printf("# define CONFIG_MQ_MAXMSGSIZE 0\n");
   printf("#endif\n\n");
   printf("#if CONFIG_MQ_MAXMSGSIZE <= 0 && !defined(CONFIG_DISABLE_MQUEUE)\n");
-  printf("# undef CONFIG_DISABLE_MQUEUE\n");
-  printf("# define CONFIG_DISABLE_MQUEUE 0\n");
+  printf("# define CONFIG_DISABLE_MQUEUE 1\n");
   printf("#endif\n\n");
   printf("/* If mountpoint support in not included, then no filesystem can be supported */\n\n");
   printf("#ifdef CONFIG_DISABLE_MOUNTPOINT\n");