-fix double free, linker issue

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

diff --git a/src/include/platform.h b/src/include/platform.h
index cc2aa03aee95ab62d9419a63cd458a4b1a31bc71..d0591b107f177fee40f1a33723d81f832037ae6f 100644 (file)
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -69,14 +69,12 @@
 
 #ifdef CYGWIN
 #include <sys/reent.h>
-#define _REENT_ONLY
-#endif
-
-#ifdef CYGWIN
-#undef _REENT_ONLY
 #endif
 
 #ifdef _MSC_VER
+#ifndef FD_SETSIZE
+#define FD_SETSIZE 1024
+#endif
 #include <Winsock2.h>
 #include <ws2tcpip.h>
 #else
@@ -90,7 +88,7 @@
 #if HAVE_NETINET_IN_SYSTM_H
 #include <netinet/in_systm.h>
 #endif
-#include <netinet/ip.h> /* superset of previous */
+#include <netinet/ip.h>         /* superset of previous */
 #include <arpa/inet.h>
 #include <netinet/tcp.h>
 #include <pwd.h>
@@ -109,8 +107,9 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <signal.h>
+#include <libgen.h>
 #ifdef WINDOWS
-#include <malloc.h> /* for alloca(), on other OSes it's in stdlib.h */
+#include <malloc.h>             /* for alloca(), on other OSes it's in stdlib.h */
 #endif
 #ifndef _MSC_VER
 #include <unistd.h>             /* KLB_FIX */
@@ -147,7 +146,7 @@
 #include <semaphore.h>
 #include <net/if.h>
 #endif
-#ifdef LINUX
+#if defined(LINUX) || defined(GNU)
 #include <net/if.h>
 #endif
 #ifdef SOLARIS
@@ -156,6 +155,9 @@
 #include <sys/loadavg.h>
 #include <semaphore.h>
 #endif
+#if HAVE_UCRED_H
+#include <ucred.h>
+#endif
 #ifdef CYGWIN
 #include <windows.h>
 #include <cygwin/if.h>
@@ -170,13 +172,18 @@
 #include <vfork.h>
 #endif
 
-#if HAVE_CTYPE_H
 #include <ctype.h>
-#endif
 #if HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
 
+#if HAVE_ENDIAN_H
+#include <endian.h>
+#endif
+#if HAVE_SYS_ENDIAN_H
+#include <sys/endian.h>
+#endif
+
 #include "plibc.h"
 
 #include <locale.h>
@@ -218,7 +225,8 @@
 
 
 #if !HAVE_ATOLL
-long long atoll (const char *nptr);
+long long
+atoll (const char *nptr);
 #endif
 
 #if ENABLE_NLS
@@ -233,10 +241,26 @@ long long atoll (const char *nptr);
 #define O_LARGEFILE 0
 #endif
 
+/**
+ * AI_NUMERICSERV not defined in windows.  Then we just do without.
+ */
+#ifndef AI_NUMERICSERV
+#define AI_NUMERICSERV 0
+#endif
+
+
 #if defined(__sparc__)
 #define MAKE_UNALIGNED(val) ({ __typeof__((val)) __tmp; memmove(&__tmp, &(val), sizeof((val))); __tmp; })
 #else
 #define MAKE_UNALIGNED(val) val
 #endif
 
+#if WINDOWS
+#define FDTYPE HANDLE
+#define SOCKTYPE SOCKET
+#else
+#define FDTYPE int
+#define SOCKTYPE int
+#endif
+
 #endif