diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-12-21 09:40:15 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-12-21 09:40:15 +0000 |
commit | c4f0fe3ea5a5ca3ce1f7dfecef719da631e4c6ac (patch) | |
tree | 02e313a83c4416f07fadf650d33aff09dfe46130 /src/dht | |
parent | 40e5092e9a5db88b4c9b62cb341596fbf6ce1cf8 (diff) | |
download | gnunet-c4f0fe3ea5a5ca3ce1f7dfecef719da631e4c6ac.tar.gz gnunet-c4f0fe3ea5a5ca3ce1f7dfecef719da631e4c6ac.zip |
fixing 2012: network structure alignment now forced to be correct even on W32 using #pragma pack from gcc 4.x
Diffstat (limited to 'src/dht')
-rw-r--r-- | src/dht/dht.h | 4 | ||||
-rw-r--r-- | src/dht/gnunet-service-dht_neighbours.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/dht/dht.h b/src/dht/dht.h index 2a6717788..c9fdd3479 100644 --- a/src/dht/dht.h +++ b/src/dht/dht.h | |||
@@ -34,6 +34,8 @@ | |||
34 | #define DHT_BLOOM_SIZE 128 | 34 | #define DHT_BLOOM_SIZE 128 |
35 | 35 | ||
36 | 36 | ||
37 | GNUNET_NETWORK_STRUCT_BEGIN | ||
38 | |||
37 | /** | 39 | /** |
38 | * Message which indicates the DHT should cancel outstanding | 40 | * Message which indicates the DHT should cancel outstanding |
39 | * requests and discard any state. | 41 | * requests and discard any state. |
@@ -191,6 +193,6 @@ struct GNUNET_DHT_ClientPutMessage | |||
191 | /* DATA copied to end of this message */ | 193 | /* DATA copied to end of this message */ |
192 | 194 | ||
193 | }; | 195 | }; |
194 | 196 | GNUNET_NETWORK_STRUCT_END | |
195 | 197 | ||
196 | #endif | 198 | #endif |
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c index 9ebf16400..907de9950 100644 --- a/src/dht/gnunet-service-dht_neighbours.c +++ b/src/dht/gnunet-service-dht_neighbours.c | |||
@@ -90,6 +90,8 @@ | |||
90 | #define GET_TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 2) | 90 | #define GET_TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 2) |
91 | 91 | ||
92 | 92 | ||
93 | GNUNET_NETWORK_STRUCT_BEGIN | ||
94 | |||
93 | /** | 95 | /** |
94 | * P2P PUT message | 96 | * P2P PUT message |
95 | */ | 97 | */ |
@@ -246,7 +248,7 @@ struct PeerGetMessage | |||
246 | /* result bloomfilter */ | 248 | /* result bloomfilter */ |
247 | 249 | ||
248 | }; | 250 | }; |
249 | 251 | GNUNET_NETWORK_STRUCT_END | |
250 | 252 | ||
251 | /** | 253 | /** |
252 | * Linked list of messages to send to a particular other peer. | 254 | * Linked list of messages to send to a particular other peer. |