aboutsummaryrefslogtreecommitdiff
path: root/src/include/gnunet_common.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/gnunet_common.h')
-rw-r--r--src/include/gnunet_common.h30
1 files changed, 0 insertions, 30 deletions
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index afaf3a4de..555a98eb5 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -42,9 +42,6 @@
42#if HAVE_NETINET_IN_H 42#if HAVE_NETINET_IN_H
43#include <netinet/in.h> 43#include <netinet/in.h>
44#endif 44#endif
45#ifdef MINGW
46#include "winproc.h"
47#endif
48#ifdef HAVE_STDINT_H 45#ifdef HAVE_STDINT_H
49#include <stdint.h> 46#include <stdint.h>
50#endif 47#endif
@@ -189,11 +186,7 @@ extern "C" {
189/** 186/**
190 * gcc-ism to get gcc bitfield layout when compiling with -mms-bitfields 187 * gcc-ism to get gcc bitfield layout when compiling with -mms-bitfields
191 */ 188 */
192#if MINGW
193#define GNUNET_GCC_STRUCT_LAYOUT __attribute__ ((gcc_struct))
194#else
195#define GNUNET_GCC_STRUCT_LAYOUT 189#define GNUNET_GCC_STRUCT_LAYOUT
196#endif
197 190
198/** 191/**
199 * gcc-ism to force alignment; we use this to align char-arrays 192 * gcc-ism to force alignment; we use this to align char-arrays
@@ -216,28 +209,6 @@ extern "C" {
216 */ 209 */
217#define GNUNET_NORETURN __attribute__ ((noreturn)) 210#define GNUNET_NORETURN __attribute__ ((noreturn))
218 211
219#if MINGW
220#if __GNUC__ > 3
221/**
222 * gcc 4.x-ism to pack structures even on W32 (to be used before structs);
223 * Using this would cause structs to be unaligned on the stack on Sparc,
224 * so we *only* use this on W32 (see #670578 from Debian); fortunately,
225 * W32 doesn't run on sparc anyway.
226 */
227#define GNUNET_NETWORK_STRUCT_BEGIN _Pragma("pack(push)") _Pragma ("pack(1)")
228
229/**
230 * gcc 4.x-ism to pack structures even on W32 (to be used after structs)
231 * Using this would cause structs to be unaligned on the stack on Sparc,
232 * so we *only* use this on W32 (see #670578 from Debian); fortunately,
233 * W32 doesn't run on sparc anyway.
234 */
235#define GNUNET_NETWORK_STRUCT_END _Pragma("pack(pop)")
236
237#else
238#error gcc 4.x or higher required on W32 systems
239#endif
240#else
241/** 212/**
242 * Define as empty, GNUNET_PACKED should suffice, but this won't work on W32 213 * Define as empty, GNUNET_PACKED should suffice, but this won't work on W32
243 */ 214 */
@@ -247,7 +218,6 @@ extern "C" {
247 * Define as empty, GNUNET_PACKED should suffice, but this won't work on W32; 218 * Define as empty, GNUNET_PACKED should suffice, but this won't work on W32;
248 */ 219 */
249#define GNUNET_NETWORK_STRUCT_END 220#define GNUNET_NETWORK_STRUCT_END
250#endif
251 221
252/* ************************ super-general types *********************** */ 222/* ************************ super-general types *********************** */
253 223