projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-ensure labels are less than 64 chars, add test for full DNS names
[oweals/gnunet.git]
/
src
/
include
/
platform.h
diff --git
a/src/include/platform.h
b/src/include/platform.h
index 4bdebf90f436e37833ea44fe5dcb0fcd60f9be22..c44f67f677eb457cc63c70ce1c7eae646ce6b530 100644
(file)
--- a/
src/include/platform.h
+++ b/
src/include/platform.h
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
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
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-20,14
+20,12
@@
/**
* @file include/platform.h
/**
* @file include/platform.h
- * @brief plaform specifics
- *
+ * @brief plaform specific includes and defines
* @author Nils Durner
* @author Nils Durner
- *
+ *
@author Christian Grothoff
* This file should never be included by installed
* This file should never be included by installed
- * header files (thos starting with "gnunet_").
+ * header files (thos
e
starting with "gnunet_").
*/
*/
-
#ifndef PLATFORM_H
#define PLATFORM_H
#ifndef PLATFORM_H
#define PLATFORM_H
@@
-50,7
+48,7
@@
#include <sys/types.h>
#endif
#include <sys/types.h>
#endif
-#define ALLOW_EXTRA_CHECKS GNUNET_
NO
+#define ALLOW_EXTRA_CHECKS GNUNET_
YES
/**
* For strptime (glibc2 needs this).
/**
* For strptime (glibc2 needs this).
@@
-69,14
+67,12
@@
#ifdef CYGWIN
#include <sys/reent.h>
#ifdef CYGWIN
#include <sys/reent.h>
-#define _REENT_ONLY
-#endif
-
-#ifdef CYGWIN
-#undef _REENT_ONLY
#endif
#ifdef _MSC_VER
#endif
#ifdef _MSC_VER
+#ifndef FD_SETSIZE
+#define FD_SETSIZE 1024
+#endif
#include <Winsock2.h>
#include <ws2tcpip.h>
#else
#include <Winsock2.h>
#include <ws2tcpip.h>
#else
@@
-90,7
+86,7
@@
#if HAVE_NETINET_IN_SYSTM_H
#include <netinet/in_systm.h>
#endif
#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>
#include <arpa/inet.h>
#include <netinet/tcp.h>
#include <pwd.h>
@@
-109,8
+105,12
@@
#include <stdarg.h>
#include <errno.h>
#include <signal.h>
#include <stdarg.h>
#include <errno.h>
#include <signal.h>
+#include <libgen.h>
#ifdef WINDOWS
#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
+#ifdef HAVE_MALLOC_H
+#include <malloc.h> /* for mallinfo on GNU */
#endif
#ifndef _MSC_VER
#include <unistd.h> /* KLB_FIX */
#endif
#ifndef _MSC_VER
#include <unistd.h> /* KLB_FIX */
@@
-139,7
+139,7
@@
#ifdef SOMEBSD
#include <net/if.h>
#endif
#ifdef SOMEBSD
#include <net/if.h>
#endif
-#ifdef
GNUNET_free
BSD
+#ifdef
FREE
BSD
#include <semaphore.h>
#endif
#ifdef DARWIN
#include <semaphore.h>
#endif
#ifdef DARWIN
@@
-147,7
+147,7
@@
#include <semaphore.h>
#include <net/if.h>
#endif
#include <semaphore.h>
#include <net/if.h>
#endif
-#if
def LINUX
+#if
defined(LINUX) || defined(GNU)
#include <net/if.h>
#endif
#ifdef SOLARIS
#include <net/if.h>
#endif
#ifdef SOLARIS
@@
-226,7
+226,8
@@
#if !HAVE_ATOLL
#if !HAVE_ATOLL
-long long atoll (const char *nptr);
+long long
+atoll (const char *nptr);
#endif
#if ENABLE_NLS
#endif
#if ENABLE_NLS
@@
-241,10
+242,26
@@
long long atoll (const char *nptr);
#define O_LARGEFILE 0
#endif
#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 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
#endif