summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorDavid Wragg <dpw@lshift.net>2010-05-30 23:31:40 +0100
committerDavid Wragg <dpw@lshift.net>2010-05-30 23:31:40 +0100
commit76e825b388c6c3b65ef238a245748f38d3f1c1fc (patch)
tree50f9a6419ea2cc3cdce1a4fa79b7be61a98adb5e /tools
parentdb064ed6e69bdc04cf3d1cb5ef31441b7bce16cc (diff)
downloadrabbitmq-c-76e825b388c6c3b65ef238a245748f38d3f1c1fc.tar.gz
Move all includes of popt.h into common.h, which depends on it anyway
Diffstat (limited to 'tools')
-rw-r--r--tools/common.c2
-rw-r--r--tools/common.h2
-rw-r--r--tools/consume.c2
-rw-r--r--tools/get.c2
-rw-r--r--tools/publish.c2
5 files changed, 2 insertions, 8 deletions
diff --git a/tools/common.c b/tools/common.c
index 6a38a95..6c0e871 100644
--- a/tools/common.c
+++ b/tools/common.c
@@ -61,8 +61,6 @@
#include <spawn.h>
#include <sys/wait.h>
-#include <popt.h>
-
#include "common.h"
extern char **environ;
diff --git a/tools/common.h b/tools/common.h
index 09a9242..8ea754c 100644
--- a/tools/common.h
+++ b/tools/common.h
@@ -50,6 +50,8 @@
#include <stdint.h>
+#include <popt.h>
+
#include <amqp.h>
#include <amqp_framing.h>
diff --git a/tools/consume.c b/tools/consume.c
index 40b61d1..b6bd5e2 100644
--- a/tools/consume.c
+++ b/tools/consume.c
@@ -53,8 +53,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <popt.h>
-
#include "common.h"
/* Convert a amqp_bytes_t to an escaped string form for printing. We
diff --git a/tools/get.c b/tools/get.c
index f746fd1..8f8e0d0 100644
--- a/tools/get.c
+++ b/tools/get.c
@@ -52,8 +52,6 @@
#include <stdio.h>
-#include <popt.h>
-
#include "common.h"
static int do_get(amqp_connection_state_t conn, char *queue)
diff --git a/tools/publish.c b/tools/publish.c
index 21314b2..15d2386 100644
--- a/tools/publish.c
+++ b/tools/publish.c
@@ -54,8 +54,6 @@
#include <stdlib.h>
#include <string.h>
-#include <popt.h>
-
#include "common.h"
static void do_publish(amqp_connection_state_t conn,