X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/794a259a335c367d852959cd88dd9d46d183a74b..HEAD:/netdissect-stdinc.h?ds=sidebyside

diff --git a/netdissect-stdinc.h b/netdissect-stdinc.h
index e81c90bd..15c3e284 100644
--- a/netdissect-stdinc.h
+++ b/netdissect-stdinc.h
@@ -139,11 +139,6 @@
    * strtoint64_t().
    */
   #define strtoint64_t	strtoll
-
-  /*
-   * And we have LL as a suffix for constants, so use that.
-   */
-  #define INT64_T_CONSTANT(constant)	(constant##LL)
 #else
   /*
    * Non-Microsoft compiler.
@@ -151,11 +146,6 @@
    * XXX - should we use strtoll or should we use _strtoi64()?
    */
   #define strtoint64_t		strtoll
-
-  /*
-   * Assume LL works.
-   */
-  #define INT64_T_CONSTANT(constant)	(constant##LL)
 #endif
 
 #ifdef _MSC_VER
@@ -166,7 +156,6 @@
    */
   #define isatty _isatty
   #define stat _stat
-  #define strdup _strdup
   #define open _open
   #define read _read
   #define close _close
@@ -202,10 +191,6 @@
 #define inline __inline
 #endif
 
-#if defined(AF_INET6) && !defined(HAVE_OS_IPV6_SUPPORT)
-#define HAVE_OS_IPV6_SUPPORT
-#endif
-
 #ifndef INET6_ADDRSTRLEN
 #define INET6_ADDRSTRLEN 46
 #endif
@@ -251,11 +236,6 @@ typedef char *caddr_t;
  * Assume all UN*Xes have strtoll(), and use it for strtoint64_t().
  */
 #define strtoint64_t	strtoll
-
-/*
- * Assume LL works.
- */
-#define INT64_T_CONSTANT(constant)	(constant##LL)
 #endif /* _WIN32 */
 
 /*
@@ -319,28 +299,6 @@ typedef char *caddr_t;
   }
 #endif
 
-/*
- * If the OS doesn't define AF_INET6 and struct in6_addr:
- *
- * define AF_INET6, so we can use it internally as a "this is an
- * IPv6 address" indication;
- *
- * define struct in6_addr so that we can use it for IPv6 addresses.
- */
-#ifndef HAVE_OS_IPV6_SUPPORT
-#ifndef AF_INET6
-#define AF_INET6	24
-
-struct in6_addr {
-	union {
-		__uint8_t   __u6_addr8[16];
-		__uint16_t  __u6_addr16[8];
-		__uint32_t  __u6_addr32[4];
-	} __u6_addr;			/* 128-bit IP6 address */
-};
-#endif
-#endif
-
 #ifndef NI_MAXHOST
 #define	NI_MAXHOST	1025
 #endif