diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-11-07 23:20:06 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-11-07 23:20:06 +0000 |
| commit | 1dffd1a9490ea84a59f58a63cb17c3ab148910fe (patch) | |
| tree | 90462fbd36b653787995ea7bcbf09668c3007064 /epan/proto.h | |
| parent | fa3332e8ede5395a28d969947e95a8c5eddc6e53 (diff) | |
GCC on amd64 align header_field_info variables to 16-bytes, this cause problems with proto_register_fields_section().
sizeof(void *) alignment should be enough, use it in HFI_INIT.
This fixes http://www.wireshark.org/lists/wireshark-dev/201311/msg00069.html
svn path=/trunk/; revision=53150
Diffstat (limited to 'epan/proto.h')
| -rw-r--r-- | epan/proto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/proto.h b/epan/proto.h index f8584d7fbd..419393b969 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -2122,7 +2122,7 @@ proto_custom_set(proto_tree* tree, const int field_id, /* #define HAVE_HFI_SECTION_INIT */ #ifdef HAVE_HFI_SECTION_INIT - #define HFI_INIT(proto) __attribute__((section( "_data_" G_STRINGIFY(proto) ))) + #define HFI_INIT(proto) __attribute__((section( "_data_" G_STRINGIFY(proto)))) __attribute__((aligned(sizeof(void *)))) #define proto_register_fields(proto, hfi, count) \ extern header_field_info __start__data_ ##proto[]; \ |