summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorРоман Донченко <DXDragon@yandex.ru>2008-10-21 01:02:00 +0400
committerH. Peter Anvin <hpa@zytor.com>2008-10-20 15:06:24 -0700
commitac5f0ab996b673cbe9476d2f5f00fed5d636b039 (patch)
tree5ca71027ae76239747a0660020ccb9201285d0da
parenta1dfd6baf8d7c561c0cbb4000cf82358be8ee920 (diff)
downloadtftp-hpa-ac5f0ab996b673cbe9476d2f5f00fed5d636b039.tar.gz
Compilation of tftp-hpa's Git HEAD with no IPv6, and misc
This patch does two things: a) makes tftp-hpa to compile on systems with no IPv6 support (there were some IPv6 macros used unconditionally); b) removes a stray binary character, which was annoying.
-rw-r--r--config.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/config.h b/config.h
index bd1dac1..76c7514 100644
--- a/config.h
+++ b/config.h
@@ -325,6 +325,11 @@ const char *gai_strerror(int);
#define AI_CANONNAME 0x0002 /* Request for canonical name. */
#endif
+#ifndef AI_ADDRCONFIG
+#define AI_ADDRCONFIG 0x0020 /* Use configuration of this host to choose
+ returned address type.. */
+#endif
+
#ifndef EAI_NONAME
#define EAI_NONAME -2 /* NAME or SERVICE is unknown. */
#endif
@@ -335,15 +340,16 @@ const char *gai_strerror(int);
#define EAI_MEMORY -10 /* Memory allocation failure. */
#endif
#ifndef EAI_SYSTEM
-#define EAI_SYSTEM -11 /* System error returned in rrno'. */
+#define EAI_SYSTEM -11 /* System error returned in `errno'. */
#endif
#endif
-#ifndef HAVE_INET_NTOP
-const char *inet_ntop(int, const void *, char *, socklen_t);
#ifndef INET6_ADDRSTRLEN
-#define INET6_ADDRSTRLEN 48
+#define INET6_ADDRSTRLEN 46
#endif
+
+#ifndef HAVE_INET_NTOP
+const char *inet_ntop(int, const void *, char *, socklen_t);
#endif
/* tftp-hpa version and configuration strings */