Clean up handling of INET6.

We wire it on, so we don't need a commented out wiring-it-on on Windows.

Explain *why* we're wiring it on rather than doing checks for IPv6
support.

Change-Id: I205ba2456160f9dad48041f27c63a09cdcdc12d3
Reviewed-on: https://code.wireshark.org/review/6313
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 8 insertions, 2 deletions

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index 0a5b3aa79f..494ab7f114 100644
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -414,7 +414,14 @@
    However, we do need it for some headers that are shared between C and C++. */
 #define _U_ ${C_UNUSED}
 
-#  define INET6 1
+/* We don't bother checking for IPv6 support; the checks done in the
+   autoconf script are relics of a bygone age, where IPv6 support in
+   OSes was sometimes present by default, sometimes provided by
+   third-party add-ons, and sometimes completely absent, and where the
+   particular flavor of IPv6 support mattered to us.  We'll just wire it
+   on, unless and until that becomes an issue on platforms where people
+   use CMake. */
+#define INET6 1
 
 #if defined(_WIN32)
 
@@ -454,7 +461,6 @@
 #  define UNICODE 1
 #  define _UNICODE 1
 
-/*#  define INET6 1*/
 #  define NEED_INET_V6DEFS_H 1
 #  define NEED_STRPTIME_H 1
 #endif