-fix

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

diff --git a/src/include/platform.h b/src/include/platform.h
index 188c76e2d82dadeff985fb06a85687c2a3b4c7bd..7383e48ad179a5813a7d6782abd0d839e82605fe 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 */
@@ -173,9 +172,7 @@
 #include <vfork.h>
 #endif
 
-#if HAVE_CTYPE_H
 #include <ctype.h>
-#endif
 #if HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
@@ -228,7 +225,8 @@
 
 
 #if !HAVE_ATOLL
-long long atoll (const char *nptr);
+long long
+atoll (const char *nptr);
 #endif
 
 #if ENABLE_NLS
@@ -249,4 +247,12 @@ long long atoll (const char *nptr);
 #define MAKE_UNALIGNED(val) val
 #endif
 
+#if WINDOWS
+#define FDTYPE HANDLE
+#define SOCKTYPE SOCKET
+#else
+#define FDTYPE int
+#define SOCKTYPE int
+#endif
+
 #endif