diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-03-17 11:53:24 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-03-17 11:53:24 +0100 |
commit | c253a40bae417335fab8446f3c7182c8c5d4833f (patch) | |
tree | 0517ab35f90bf290744e5a9ddfeb75ca9547cdbe /src/consensus | |
parent | 273188e646ed4d91ced1dac443e976336be877b4 (diff) | |
parent | 79fb947eb8fba243ea65e19b40b65e04f8806865 (diff) | |
download | gnunet-c253a40bae417335fab8446f3c7182c8c5d4833f.tar.gz gnunet-c253a40bae417335fab8446f3c7182c8c5d4833f.zip |
Merge branch 'master' into getopt
Diffstat (limited to 'src/consensus')
-rw-r--r-- | src/consensus/consensus_protocol.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/consensus/consensus_protocol.h b/src/consensus/consensus_protocol.h index 320d460c7..f2933ed6f 100644 --- a/src/consensus/consensus_protocol.h +++ b/src/consensus/consensus_protocol.h | |||
@@ -109,7 +109,7 @@ struct ConsensusElement | |||
109 | /** | 109 | /** |
110 | * Is this a marker element? | 110 | * Is this a marker element? |
111 | */ | 111 | */ |
112 | uint8_t marker GNUNET_PACKED; | 112 | uint8_t marker; |
113 | 113 | ||
114 | /* rest: element data */ | 114 | /* rest: element data */ |
115 | }; | 115 | }; |
@@ -117,7 +117,7 @@ struct ConsensusElement | |||
117 | 117 | ||
118 | struct ConsensusSizeElement | 118 | struct ConsensusSizeElement |
119 | { | 119 | { |
120 | struct ConsensusElement ce GNUNET_PACKED; | 120 | struct ConsensusElement ce; |
121 | 121 | ||
122 | uint64_t size GNUNET_PACKED; | 122 | uint64_t size GNUNET_PACKED; |
123 | uint8_t sender_index; | 123 | uint8_t sender_index; |
@@ -125,7 +125,7 @@ struct ConsensusSizeElement | |||
125 | 125 | ||
126 | struct ConsensusStuffedElement | 126 | struct ConsensusStuffedElement |
127 | { | 127 | { |
128 | struct ConsensusElement ce GNUNET_PACKED; | 128 | struct ConsensusElement ce; |
129 | struct GNUNET_HashCode rand GNUNET_PACKED; | 129 | struct GNUNET_HashCode rand GNUNET_PACKED; |
130 | }; | 130 | }; |
131 | 131 | ||