diff options
Diffstat (limited to 'net/tnftp/files/tnftp.h')
| -rw-r--r-- | net/tnftp/files/tnftp.h | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/net/tnftp/files/tnftp.h b/net/tnftp/files/tnftp.h index dae6d35d471..fe7841a735f 100644 --- a/net/tnftp/files/tnftp.h +++ b/net/tnftp/files/tnftp.h @@ -1,10 +1,11 @@ -/* $NetBSD: tnftp.h,v 1.12 2007/08/07 03:37:53 lukem Exp $ */ +/* $NetBSD: tnftp.h,v 1.13 2014/10/31 18:59:32 spz Exp $ */ #define FTP_PRODUCT PACKAGE_NAME #define FTP_VERSION PACKAGE_VERSION -#include "config.h" +#include "tnftp_config.h" +#include <assert.h> #include <stdio.h> #include <ctype.h> #include <errno.h> @@ -40,6 +41,9 @@ #if defined(HAVE_NETINET_IP_H) # include <netinet/ip.h> #endif +#if defined(HAVE_NETINET_TCP_H) +# include <netinet/tcp.h> +#endif #if defined(HAVE_NETDB_H) # if HAVE_DECL_AI_NUMERICHOST # include <netdb.h> @@ -93,6 +97,9 @@ #if defined(HAVE_LIMITS_H) # include <limits.h> #endif +#if defined(HAVE_LOCALE_H) +# include <locale.h> +#endif #if defined(HAVE_PWD_H) # include <pwd.h> #endif @@ -210,16 +217,10 @@ typedef unsigned short sa_family_t; #endif #if !defined(HAVE_SOCKLEN_T) -#ifdef __sgi -typedef int socklen_t; -#else typedef unsigned int socklen_t; #endif -#endif -#if HAVE_DECL_AF_INET6 \ - && defined(HAVE_STRUCT_SOCKADDR_IN6) \ - && HAVE_DECL_NS_IN6ADDRSZ +#if defined(USE_INET6) # define INET6 #endif @@ -499,3 +500,15 @@ int utimes(const char *, const struct timeval *); #define getaddrinfo Rgetaddrinfo #define getipnodebyname Rgetipnodebyname #endif /* defined(USE_SOCKS) */ + + +/* + * Compatibility for stuff in NetBSD <sys/cdefs.h> + */ +#undef __dead +#define __dead + +#ifdef __UNCONST +#undef __UNCONST +#endif +#define __UNCONST(a) ((void *)(unsigned long)(const void *)(a)) |