[GNUnet-SVN] r30050 - gnunet/src/mesh

[gnunet]

Author: grothoff
Date: 2013-10-09 13:42:42 +0200 (Wed, 09 Oct 2013)
New Revision: 30050

Modified:
   gnunet/src/mesh/gnunet-service-mesh_channel.h
   gnunet/src/mesh/gnunet-service-mesh_connection.h
   gnunet/src/mesh/gnunet-service-mesh_peer.h
   gnunet/src/mesh/gnunet-service-mesh_tunnel.h
Log:
-fix header inclusion

Modified: gnunet/src/mesh/gnunet-service-mesh_channel.h
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_channel.h       2013-10-09 11:30:59 UTC 
(rev 30049)
+++ gnunet/src/mesh/gnunet-service-mesh_channel.h       2013-10-09 11:42:42 UTC 
(rev 30050)
@@ -40,13 +40,15 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 
-#include "gnunet-service-mesh_tunnel.h"
-
 /**
  * Struct containing all information regarding a channel to a remote client.
  */
 struct MeshChannel;
 
+
+#include "gnunet-service-mesh_tunnel.h"
+
+
 /**
  * Get channel ID.
  *
@@ -241,4 +243,4 @@
 
 /* ifndef GNUNET_SERVICE_MESH_CHANNEL_H */
 #endif
-/* end of gnunet-service-mesh_channel.h */
\ No newline at end of file
+/* end of gnunet-service-mesh_channel.h */

Modified: gnunet/src/mesh/gnunet-service-mesh_connection.h
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_connection.h    2013-10-09 11:30:59 UTC 
(rev 30049)
+++ gnunet/src/mesh/gnunet-service-mesh_connection.h    2013-10-09 11:42:42 UTC 
(rev 30050)
@@ -39,11 +39,7 @@
 
 #include "gnunet_util_lib.h"
 
-#include "mesh_path.h"
-#include "gnunet-service-mesh_channel.h"
-#include "gnunet-service-mesh_peer.h"
 
-
 /**
  * All the states a connection can be in.
  */
@@ -76,9 +72,13 @@
  */
 struct MeshConnection;
 
+#include "mesh_path.h"
+#include "gnunet-service-mesh_channel.h"
+#include "gnunet-service-mesh_peer.h"
 
 
 
+
 /**
  * Core handler for connection creation.
  *
@@ -407,4 +407,4 @@
 
 /* ifndef GNUNET_SERVICE_MESH_CONNECTION_H */
 #endif
-/* end of gnunet-service-mesh_connection.h */
\ No newline at end of file
+/* end of gnunet-service-mesh_connection.h */

Modified: gnunet/src/mesh/gnunet-service-mesh_peer.h
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_peer.h  2013-10-09 11:30:59 UTC (rev 
30049)
+++ gnunet/src/mesh/gnunet-service-mesh_peer.h  2013-10-09 11:42:42 UTC (rev 
30050)
@@ -40,14 +40,14 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 
-#include "gnunet-service-mesh_connection.h"
-
 /**
  * Struct containing all information regarding a given peer
  */
 struct MeshPeer;
 
+#include "gnunet-service-mesh_connection.h"
 
+
 
/******************************************************************************/
 /********************************    API    
***********************************/
 
/******************************************************************************/
@@ -78,7 +78,7 @@
  * @param fwd Is this a message going root->dest? (FWD ACK are NOT FWD!)
  */
 void
-GMP_queue_add (void *cls, uint16_t type, size_t size, 
+GMP_queue_add (void *cls, uint16_t type, size_t size,
                struct MeshConnection *c,
                struct MeshChannel *ch,
                int fwd);
@@ -161,4 +161,4 @@
 
 /* ifndef GNUNET_MESH_SERVICE_PEER_H */
 #endif
-/* end of gnunet-mesh-service_peer.h */
\ No newline at end of file
+/* end of gnunet-mesh-service_peer.h */

Modified: gnunet/src/mesh/gnunet-service-mesh_tunnel.h
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_tunnel.h        2013-10-09 11:30:59 UTC 
(rev 30049)
+++ gnunet/src/mesh/gnunet-service-mesh_tunnel.h        2013-10-09 11:42:42 UTC 
(rev 30050)
@@ -40,9 +40,6 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 
-#include "gnunet-service-mesh_channel.h"
-#include "gnunet-service-mesh_connection.h"
-
 /**
  * All the states a tunnel can be in.
  */
@@ -79,6 +76,11 @@
  */
 struct MeshTunnel3;
 
+
+#include "gnunet-service-mesh_channel.h"
+#include "gnunet-service-mesh_connection.h"
+
+
 
/******************************************************************************/
 /********************************    API    
***********************************/
 
/******************************************************************************/
@@ -234,4 +236,4 @@
 
 /* ifndef GNUNET_MESH_SERVICE_TUNNEL_H */
 #endif
-/* end of gnunet-mesh-service_tunnel.h */
\ No newline at end of file
+/* end of gnunet-mesh-service_tunnel.h */