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
This commit is contained in:
parent
4584a81149
commit
71fca3c87f
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue