diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-09-15 15:13:40 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-09-15 15:13:40 +0000 |
| commit | 71fca3c87fcfb06fa0103e49d333c73f468047b0 (patch) | |
| tree | 2b1f39856c147a13365012028a36891a72131a01 /wsutil | |
| parent | 4584a8114933597ef05c69556870f666ac47564f (diff) | |
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5160 differently:
On Windows, rename inet_pton() to ws_inet_pton() so that builds on Vista or
later systems (that have inet_pton() natively) will still work on pre-Vista
systems.
svn path=/trunk/; revision=34122
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/inet_v6defs.h | 10 | ||||
| -rw-r--r-- | wsutil/libwsutil.def | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/wsutil/inet_v6defs.h b/wsutil/inet_v6defs.h index dc770f89c5..f02faf0f7e 100644 --- a/wsutil/inet_v6defs.h +++ b/wsutil/inet_v6defs.h @@ -28,6 +28,16 @@ * Versions of "inet_pton()" and "inet_ntop()", for the benefit of OSes that * don't have it. */ + +/* Windows does not have inet_pton() until Vista. In order to allow binaries + * compiled on Vista or later to work on pre-Vista Windows (without resorting + * to fragile link ordering tricks), we rename our inet_pton() to + * ws_inet_pton(). + */ +#ifdef WIN32 +#define inet_pton ws_inet_pton +#endif + 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, diff --git a/wsutil/libwsutil.def b/wsutil/libwsutil.def index e0e0202187..7bb5ae2aaf 100644 --- a/wsutil/libwsutil.def +++ b/wsutil/libwsutil.def @@ -29,7 +29,8 @@ inet_aton inet_ntop ; inet_pton.c -inet_pton +; Note: inet_v6defs.h renames this function for Windows (only) +ws_inet_pton ; mpeg-audio.c mpa_bitrate |