From c4f0fe3ea5a5ca3ce1f7dfecef719da631e4c6ac Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 21 Dec 2011 09:40:15 +0000 Subject: fixing 2012: network structure alignment now forced to be correct even on W32 using #pragma pack from gcc 4.x --- src/dht/dht.h | 4 +++- src/dht/gnunet-service-dht_neighbours.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/dht') 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 @@ #define DHT_BLOOM_SIZE 128 +GNUNET_NETWORK_STRUCT_BEGIN + /** * Message which indicates the DHT should cancel outstanding * requests and discard any state. @@ -191,6 +193,6 @@ struct GNUNET_DHT_ClientPutMessage /* DATA copied to end of this message */ }; - +GNUNET_NETWORK_STRUCT_END #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 @@ #define GET_TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 2) +GNUNET_NETWORK_STRUCT_BEGIN + /** * P2P PUT message */ @@ -246,7 +248,7 @@ struct PeerGetMessage /* result bloomfilter */ }; - +GNUNET_NETWORK_STRUCT_END /** * Linked list of messages to send to a particular other peer. -- cgit v1.2.3