aboutsummaryrefslogtreecommitdiff
path: root/src/mesh
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-12-21 09:40:15 +0000
committerChristian Grothoff <christian@grothoff.org>2011-12-21 09:40:15 +0000
commitc4f0fe3ea5a5ca3ce1f7dfecef719da631e4c6ac (patch)
tree02e313a83c4416f07fadf650d33aff09dfe46130 /src/mesh
parent40e5092e9a5db88b4c9b62cb341596fbf6ce1cf8 (diff)
downloadgnunet-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/mesh')
-rw-r--r--src/mesh/mesh.h4
-rw-r--r--src/mesh/mesh_protocol.h3
2 files changed, 6 insertions, 1 deletions
diff --git a/src/mesh/mesh.h b/src/mesh/mesh.h
index fcddb2eb9..d8fc404e1 100644
--- a/src/mesh/mesh.h
+++ b/src/mesh/mesh.h
@@ -85,6 +85,8 @@
85/************************** MESSAGES ******************************/ 85/************************** MESSAGES ******************************/
86/******************************************************************************/ 86/******************************************************************************/
87 87
88GNUNET_NETWORK_STRUCT_BEGIN
89
88/** 90/**
89 * Message for a client to register to the service 91 * Message for a client to register to the service
90 */ 92 */
@@ -209,7 +211,7 @@ struct GNUNET_MESH_ConnectPeerByType
209 */ 211 */
210 GNUNET_MESH_ApplicationType type GNUNET_PACKED; 212 GNUNET_MESH_ApplicationType type GNUNET_PACKED;
211}; 213};
212 214GNUNET_NETWORK_STRUCT_END
213 215
214/******************************************************************************/ 216/******************************************************************************/
215/************************ ENUMERATIONS ****************************/ 217/************************ ENUMERATIONS ****************************/
diff --git a/src/mesh/mesh_protocol.h b/src/mesh/mesh_protocol.h
index b6c7f1b24..885f1f344 100644
--- a/src/mesh/mesh_protocol.h
+++ b/src/mesh/mesh_protocol.h
@@ -39,6 +39,8 @@ extern "C"
39/******************** MESH NETWORK MESSAGES **************************/ 39/******************** MESH NETWORK MESSAGES **************************/
40/******************************************************************************/ 40/******************************************************************************/
41 41
42GNUNET_NETWORK_STRUCT_BEGIN
43
42/** 44/**
43 * Message for mesh path management 45 * Message for mesh path management
44 */ 46 */
@@ -276,6 +278,7 @@ struct GNUNET_MESH_SpeedNotify
276 uint32_t speed_min; 278 uint32_t speed_min;
277 279
278}; 280};
281GNUNET_NETWORK_STRUCT_END
279 282
280#if 0 /* keep Emacsens' auto-indent happy */ 283#if 0 /* keep Emacsens' auto-indent happy */
281{ 284{