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/nse | |
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/nse')
-rw-r--r-- | src/nse/gnunet-service-nse.c | 4 | ||||
-rw-r--r-- | src/nse/nse.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c index 7c3f14273..d37ecd941 100644 --- a/src/nse/gnunet-service-nse.c +++ b/src/nse/gnunet-service-nse.c | |||
@@ -128,6 +128,8 @@ struct NSEPeerEntry | |||
128 | }; | 128 | }; |
129 | 129 | ||
130 | 130 | ||
131 | GNUNET_NETWORK_STRUCT_BEGIN | ||
132 | |||
131 | /** | 133 | /** |
132 | * Network size estimate reply; sent when "this" | 134 | * Network size estimate reply; sent when "this" |
133 | * peer's timer has run out before receiving a | 135 | * peer's timer has run out before receiving a |
@@ -178,7 +180,7 @@ struct GNUNET_NSE_FloodMessage | |||
178 | */ | 180 | */ |
179 | struct GNUNET_CRYPTO_RsaSignature signature; | 181 | struct GNUNET_CRYPTO_RsaSignature signature; |
180 | }; | 182 | }; |
181 | 183 | GNUNET_NETWORK_STRUCT_END | |
182 | 184 | ||
183 | /** | 185 | /** |
184 | * Handle to our current configuration. | 186 | * Handle to our current configuration. |
diff --git a/src/nse/nse.h b/src/nse/nse.h index 91b629657..2123e3996 100644 --- a/src/nse/nse.h +++ b/src/nse/nse.h | |||
@@ -35,6 +35,8 @@ | |||
35 | */ | 35 | */ |
36 | #define DEBUG_NSE GNUNET_EXTRA_LOGGING | 36 | #define DEBUG_NSE GNUNET_EXTRA_LOGGING |
37 | 37 | ||
38 | GNUNET_NETWORK_STRUCT_BEGIN | ||
39 | |||
38 | /** | 40 | /** |
39 | * Network size estimate sent from the service | 41 | * Network size estimate sent from the service |
40 | * to clients. Contains the current size estimate | 42 | * to clients. Contains the current size estimate |
@@ -71,6 +73,6 @@ struct GNUNET_NSE_ClientMessage | |||
71 | */ | 73 | */ |
72 | double std_deviation GNUNET_PACKED; | 74 | double std_deviation GNUNET_PACKED; |
73 | }; | 75 | }; |
74 | 76 | GNUNET_NETWORK_STRUCT_END | |
75 | 77 | ||
76 | #endif | 78 | #endif |