[GNUnet-SVN] r20143 - gnunet/src/include

[gnunet]

Author: grothoff
Date: 2012-02-29 13:50:51 +0100 (Wed, 29 Feb 2012)
New Revision: 20143

Modified:
   gnunet/src/include/gnunet_common.h
   gnunet/src/include/gnunet_dnsparser_lib.h
   gnunet/src/include/gnunet_tun_lib.h
Log:
LRN: Enforce GCC bitfield layout for some structs on W32




Modified: gnunet/src/include/gnunet_common.h
===================================================================
--- gnunet/src/include/gnunet_common.h  2012-02-29 11:11:10 UTC (rev 20142)
+++ gnunet/src/include/gnunet_common.h  2012-02-29 12:50:51 UTC (rev 20143)
@@ -141,6 +141,15 @@
 #define GNUNET_PACKED __attribute__((packed))
 
 /**
+ * gcc-ism to get gcc bitfield layout when compiling with -mms-bitfields
+ */
+#if MINGW
+#define GNUNET_GCC_STRUCT_LAYOUT __attribute__((gcc_struct))
+#else
+#define GNUNET_GCC_STRUCT_LAYOUT
+#endif
+
+/**
  * gcc-ism to document unused arguments
  */
 #define GNUNET_UNUSED __attribute__((unused))

Modified: gnunet/src/include/gnunet_dnsparser_lib.h
===================================================================
--- gnunet/src/include/gnunet_dnsparser_lib.h   2012-02-29 11:11:10 UTC (rev 
20142)
+++ gnunet/src/include/gnunet_dnsparser_lib.h   2012-02-29 12:50:51 UTC (rev 
20143)
@@ -128,7 +128,7 @@
    */
   unsigned int recursion_available  : 1 GNUNET_PACKED; 
   
-};
+} GNUNET_GCC_STRUCT_LAYOUT;
 
 
 /**

Modified: gnunet/src/include/gnunet_tun_lib.h
===================================================================
--- gnunet/src/include/gnunet_tun_lib.h 2012-02-29 11:11:10 UTC (rev 20142)
+++ gnunet/src/include/gnunet_tun_lib.h 2012-02-29 12:50:51 UTC (rev 20143)
@@ -119,7 +119,7 @@
    * Destination of the packet.
    */ 
   struct in_addr destination_address GNUNET_PACKED;
-};
+} GNUNET_GCC_STRUCT_LAYOUT;
 
 
 /**
@@ -163,7 +163,7 @@
    * Destination of the packet.
    */ 
   struct in6_addr destination_address GNUNET_PACKED;
-};
+} GNUNET_GCC_STRUCT_LAYOUT;
 
 
 /**
@@ -224,7 +224,7 @@
    * Urgent pointer.
    */
   uint16_t urgent_pointer GNUNET_PACKED;
-};
+} GNUNET_GCC_STRUCT_LAYOUT;
 
 
 /**