diff options
author | David Wragg <david@rabbitmq.com> | 2010-09-03 10:18:55 +0100 |
---|---|---|
committer | David Wragg <david@rabbitmq.com> | 2010-09-03 10:18:55 +0100 |
commit | b85fa81a4076536048ea374094dccbd580a5fe6e (patch) | |
tree | 7985515d5dd7925706eaa82623449b6eaa053b7a /tools/common.h | |
parent | b339e621a8a85fbd749fdb499161320abed5ebb3 (diff) | |
parent | 1b1340ad50e18edc194f26a7156cab44b8a1bba0 (diff) | |
download | rabbitmq-c-github-ask-bug22951.tar.gz |
Merge amqp_0_9_1 into bug22951 to remove headbug22951
Diffstat (limited to 'tools/common.h')
-rw-r--r-- | tools/common.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tools/common.h b/tools/common.h index 09a9242..84889d3 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> @@ -60,6 +62,8 @@ extern void die(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); extern void die_errno(int err, const char *fmt, ...) __attribute__ ((format (printf, 2, 3))); +extern void die_amqp_error(int err, const char *fmt, ...) + __attribute__ ((format (printf, 2, 3))); extern void die_rpc(amqp_rpc_reply_t r, const char *fmt, ...) __attribute__ ((format (printf, 2, 3))); @@ -73,14 +77,6 @@ extern void write_all(int fd, amqp_bytes_t data); extern void copy_body(amqp_connection_state_t conn, int fd); -struct pipeline { - int pid; - int infd; -}; - -extern void pipeline(const char * const *argv, struct pipeline *pl); -extern int finish_pipeline(struct pipeline *pl); - #define INCLUDE_OPTIONS(options) \ {NULL, 0, POPT_ARG_INCLUDE_TABLE, options, 0, options ## _title, NULL} |