#ifdef WINDOWS
#define BREAKPOINT asm("int $3;");
+#define GNUNET_SIGCHLD 17
#else
#define BREAKPOINT
+#define GNUNET_SIGCHLD SIGCHLD
#endif
#ifdef HAVE_SYS_TYPES_H
#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
#ifndef MINGW
#include <netdb.h>
#include <sys/socket.h>
+#include <sys/un.h>
+#if HAVE_NETINET_IN_H
#include <netinet/in.h>
+#endif
+#if HAVE_NETINET_IN_SYSTM_H
+#include <netinet/in_systm.h>
+#endif
+#include <netinet/ip.h> /* superset of previous */
#include <arpa/inet.h>
#include <netinet/tcp.h>
#include <pwd.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
+#include <stdint.h>
#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 */
+#endif
#ifndef _MSC_VER
#include <unistd.h> /* KLB_FIX */
#endif
#ifdef GNUNET_freeBSD
#include <semaphore.h>
#endif
-#ifdef OSX
+#ifdef DARWIN
#include <dlfcn.h>
#include <semaphore.h>
#include <net/if.h>
#endif
#ifdef SOLARIS
#include <sys/sockio.h>
+#include <sys/filio.h>
#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>
#include <errno.h>
#include <limits.h>
-#if HAVE_CTYPE_H
-#include <ctype.h>
+#if HAVE_VFORK_H
+#include <vfork.h>
#endif
+
+#include <ctype.h>
#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 <pthread.h>
#include <locale.h>
#ifndef FRAMEWORK_BUILD
#include "gettext.h"
#define __BIG_ENDIAN BIG_ENDIAN
#endif
-#ifdef OSX
-#define socklen_t unsigned int
+#ifdef DARWIN
#define __BYTE_ORDER BYTE_ORDER
#define __BIG_ENDIAN BIG_ENDIAN
- /* not available on OS X, override configure */
+ /* not available on darwin, override configure */
#undef HAVE_STAT64
#undef HAVE_MREMAP
#endif
#if !HAVE_ATOLL
-long long atoll (const char *nptr);
+long long
+atoll (const char *nptr);
#endif
#if ENABLE_NLS
#include "langinfo.h"
#endif
+#ifndef SIZE_MAX
+#define SIZE_MAX ((size_t)(-1))
+#endif
+
#ifndef O_LARGEFILE
#define O_LARGEFILE 0
#endif
#define MAKE_UNALIGNED(val) val
#endif
+#if WINDOWS
+#define FDTYPE HANDLE
+#define SOCKTYPE SOCKET
+#else
+#define FDTYPE int
+#define SOCKTYPE int
+#endif
+
#endif