-remove GNUNET_MQ_impl_send_commit, make it part of send_continue, to ensure calling...

[oweals/gnunet.git] / src / include / platform.h

diff --git a/src/include/platform.h b/src/include/platform.h
index d0591b107f177fee40f1a33723d81f832037ae6f..5591f2547ea92ad8c1d696308c91ea4613e3adcd 100644 (file)
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
-     (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 Christian Grothoff (and other contributing authors)
+     (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2012 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -20,14 +20,12 @@
 
 /**
  * @file include/platform.h
- * @brief plaform specifics
- *
+ * @brief plaform specific includes and defines
  * @author Nils Durner
- *
+ * @author Christian Grothoff
  * This file should never be included by installed
- * header files (thos starting with "gnunet_").
+ * header files (those starting with "gnunet_").
  */
-
 #ifndef PLATFORM_H
 #define PLATFORM_H
 
@@ -56,7 +54,7 @@
  * For strptime (glibc2 needs this).
  */
 #ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE
+#define _XOPEN_SOURCE 499
 #endif
 
 #ifndef _REENTRANT
@@ -88,7 +86,9 @@
 #if HAVE_NETINET_IN_SYSTM_H
 #include <netinet/in_systm.h>
 #endif
+#if HAVE_NETINET_IP_H
 #include <netinet/ip.h>         /* superset of previous */
+#endif
 #include <arpa/inet.h>
 #include <netinet/tcp.h>
 #include <pwd.h>
@@ -111,6 +111,9 @@
 #ifdef WINDOWS
 #include <malloc.h>             /* for alloca(), on other OSes it's in stdlib.h */
 #endif
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>             /* for mallinfo on GNU */
+#endif
 #ifndef _MSC_VER
 #include <unistd.h>             /* KLB_FIX */
 #endif
@@ -138,7 +141,7 @@
 #ifdef SOMEBSD
 #include <net/if.h>
 #endif
-#ifdef GNUNET_freeBSD
+#ifdef FREEBSD
 #include <semaphore.h>
 #endif
 #ifdef DARWIN
@@ -263,4 +266,10 @@ atoll (const char *nptr);
 #define SOCKTYPE int
 #endif
 
+#if ENABLE_SUPERMUC
+#define GNUNET_TERM_SIG SIGUSR1
+#else
+#define GNUNET_TERM_SIG SIGTERM
+#endif
+
 #endif