Untabify.

[obnox/wireshark/wip.git] / inet_pton.c

diff --git a/inet_pton.c b/inet_pton.c
index 6fd6f748b0a1d0c6d84e9397e864a1d5c2d11607..bfa2535f3e0b74e8c6680ace446028a2a1bdb997 100644 (file)
--- a/inet_pton.c
+++ b/inet_pton.c
@@ -1,6 +1,8 @@
 /*
  * Copyright (c) 1996,1999 by Internet Software Consortium.
  *
+ * $Id$
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
@@ -19,10 +21,6 @@
 #include "config.h"
 #endif
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
@@ -36,9 +34,11 @@ static char rcsid[] = "$Id$";
 #endif
 
 #ifdef HAVE_WINSOCK2_H
-#include <winsock2.h>          /* needed to define AF_ values on Windows */
+#include <winsock2.h>  /* needed to define AF_ values on Windows */
+#if _MSC_VER < 1600    /* errno.h defines EAFNOSUPPORT in Windows VC10 (and presumably eventually in VC11 ...) */
 #define EAFNOSUPPORT    WSAEAFNOSUPPORT
 #endif
+#endif
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>