From: Danny Mayer <mayer@ntp.org>
Date: Thu, 12 Oct 2006 02:39:16 +0000 (-0400)
Subject: Bug #718. Update to config.h to deal with socklen_t
X-Git-Tag: NTP_4_2_3P56~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21646435ca799fedaac39349d4ea36eb69b892a9;p=thirdparty%2Fntp.git

Bug #718. Update to config.h to deal with socklen_t

bk: 452daad4We_NZ19u4w9QLEAR1jHcJw
---

diff --git a/ports/winnt/include/config.h b/ports/winnt/include/config.h
index 69982287f..bbbb3e3c0 100644
--- a/ports/winnt/include/config.h
+++ b/ports/winnt/include/config.h
@@ -13,11 +13,18 @@
 #define HAVE_STRUCT_SOCKADDR_STORAGE
 #define ISC_PLATFORM_HAVEIPV6
 #define ISC_PLATFORM_HAVEIN6PKTINFO
+#else
+typedef int socklen_t;	/* VS 6.0 doesn't know about socklen_t */
 #endif
 
 #define ISC_PLATFORM_NEEDIN6ADDRANY
 #define HAVE_SOCKADDR_IN6
 
+/*
+ * The type of the socklen_t defined for getnameinfo() and getaddrinfo()
+ * is int for VS compilers on Windows but the type is already declared 
+ */
+#define GETSOCKNAME_SOCKLEN_TYPE socklen_t
 /*
  * An attempt to cut down the number of warnings generated during compilation.
  * All of these should be benign to disable.
@@ -76,6 +83,12 @@
  * Multimedia timer enable
  */
 #define USE_MM_TIMER
+/*
+ * Use 32-bit time definitions
+ * VS 2005 defaults to 64-bit time
+ * Leave commented out for now
+ */
+//#define _USE_32BIT_TIME_T
 
 /* Enable OpenSSL */
 #define OPENSSL 1