diff options
| author | Tony Garnock-Jones <tonyg@kcbbs.gen.nz> | 2009-08-12 06:49:12 +0100 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@kcbbs.gen.nz> | 2009-08-12 06:49:12 +0100 |
| commit | 19f881c97ccacad36a83dbc142e3becbe6d5a7de (patch) | |
| tree | 22429c593440a8dd5d38b8276de56b077ed2e9e7 /librabbitmq | |
| parent | ffb9eeaab912ec8edc260a264bbe6e31bb06a941 (diff) | |
| parent | 8387f05f9828268eaa30df196057e175100644e6 (diff) | |
| download | rabbitmq-c-github-ask-19f881c97ccacad36a83dbc142e3becbe6d5a7de.tar.gz | |
merge default into amqp_0_9_1
Diffstat (limited to 'librabbitmq')
| -rw-r--r-- | librabbitmq/Makefile.am | 13 | ||||
| -rw-r--r-- | librabbitmq/codegen.py | 1 |
2 files changed, 9 insertions, 5 deletions
diff --git a/librabbitmq/Makefile.am b/librabbitmq/Makefile.am index 44b9d78..12dbd25 100644 --- a/librabbitmq/Makefile.am +++ b/librabbitmq/Makefile.am @@ -3,14 +3,17 @@ lib_LTLIBRARIES = librabbitmq.la librabbitmq_la_SOURCES = amqp_mem.c amqp_table.c amqp_connection.c amqp_socket.c amqp_debug.c amqp_api.c nodist_librabbitmq_la_SOURCES = amqp_framing.c include_HEADERS = amqp_framing.h amqp.h -noinst_librabbitmq_la_INCLUDES = amqp_private.h +noinst_HEADERS = amqp_private.h BUILT_SOURCES = amqp_framing.h amqp_framing.c CLEANFILES = amqp_framing.h amqp_framing.c +EXTRA_DIST = codegen.py PYTHON = python2.5 -amqp_framing.h: $(AMQP_SPEC_JSON_PATH) codegen.py - PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) codegen.py header $< $@ +CODEGEN_PY=$(srcdir)/codegen.py -amqp_framing.c: $(AMQP_SPEC_JSON_PATH) codegen.py - PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) codegen.py body $< $@ +amqp_framing.h: $(AMQP_SPEC_JSON_PATH) $(CODEGEN_PY) + PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) header $< $@ + +amqp_framing.c: $(AMQP_SPEC_JSON_PATH) $(CODEGEN_PY) + PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) body $< $@ diff --git a/librabbitmq/codegen.py b/librabbitmq/codegen.py index aab6d95..42eed5e 100644 --- a/librabbitmq/codegen.py +++ b/librabbitmq/codegen.py @@ -294,6 +294,7 @@ int amqp_decode_properties(uint16_t class_id, partial_flags = D_16(encoded, offset); offset += 2; flags |= (partial_flags << (flagword_index * 16)); + flagword_index++; } while (partial_flags & 1); switch (class_id) {""" |