aboutsummaryrefslogtreecommitdiffstats
path: root/inet_v6defs.h
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2007-06-11 18:26:09 +0000
committerGerald Combs <gerald@wireshark.org>2007-06-11 18:26:09 +0000
commitf60e81aaac118e5b3e71c62a77bff911087b0915 (patch)
treeb753a8a627171614f46ecf5b8cba48cd34d5ceea /inet_v6defs.h
parent68cdbd4e65f32e498f92cf90df5a2bad69295ae3 (diff)
Fix compilation under VS6 (hopefully without breaking compilation
anywhere else). Instead of using getaddrinfo() and getnameinfo(), promote inet_pton.c and inet_ntop.c to the top level and use those routines instead. (It's 2007, for crying out loud. Why is this even an issue?) svn path=/trunk/; revision=22075
Diffstat (limited to 'inet_v6defs.h')
-rw-r--r--inet_v6defs.h54
1 files changed, 54 insertions, 0 deletions
diff --git a/inet_v6defs.h b/inet_v6defs.h
new file mode 100644
index 0000000000..dc770f89c5
--- /dev/null
+++ b/inet_v6defs.h
@@ -0,0 +1,54 @@
+/* inet_v6defs.h
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __INET_V6DEFS_H__
+#define __INET_V6DEFS_H__
+
+/*
+ * Versions of "inet_pton()" and "inet_ntop()", for the benefit of OSes that
+ * don't have it.
+ */
+extern int inet_pton(int af, const char *src, void *dst);
+#ifndef HAVE_INET_NTOP_PROTO
+extern const char *inet_ntop(int af, const void *src, char *dst,
+ size_t size);
+#endif
+
+/*
+ * Those OSes may also not have AF_INET6, so declare it here if it's not
+ * already declared, so that we can pass it to "inet_ntop()" and "inet_pton()".
+ */
+#ifndef AF_INET6
+#define AF_INET6 127 /* pick a value unlikely to duplicate an existing AF_ value */
+#endif
+
+/*
+ * And if __P isn't defined, define it here, so we can use it in
+ * "inet_ntop.c" and "inet_pton.c" (rather than having to change them
+ * not to use it).
+ */
+#ifndef __P
+#define __P(args) args
+#endif
+
+#endif