diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-09-15 21:41:27 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-09-15 21:41:27 +0000 |
| commit | e8bee3d12e115079e81e9b3071faf3123000ecf9 (patch) | |
| tree | 530236a21bac3dce196561fab331ab3fc294001f /wsutil | |
| parent | 84c08f1472f0f755503b25c7d9977612cbfc0050 (diff) | |
Also rename inet_ntop() on Windows
svn path=/trunk/; revision=34129
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/inet_v6defs.h | 9 | ||||
| -rw-r--r-- | wsutil/libwsutil.def | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/wsutil/inet_v6defs.h b/wsutil/inet_v6defs.h index f02faf0f7e..c6cfa8fdec 100644 --- a/wsutil/inet_v6defs.h +++ b/wsutil/inet_v6defs.h @@ -29,13 +29,14 @@ * 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(). +/* Windows does not have inet_pton() and 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 give our versions + * of those functions Wireshark-specific names. */ #ifdef WIN32 #define inet_pton ws_inet_pton +#define inet_ntop ws_inet_ntop #endif extern int inet_pton(int af, const char *src, void *dst); diff --git a/wsutil/libwsutil.def b/wsutil/libwsutil.def index 7bb5ae2aaf..1dff793519 100644 --- a/wsutil/libwsutil.def +++ b/wsutil/libwsutil.def @@ -26,7 +26,8 @@ ws_module_open inet_aton ; inet_ntop.c -inet_ntop +; Note: inet_v6defs.h renames this function for Windows (only) +ws_inet_ntop ; inet_pton.c ; Note: inet_v6defs.h renames this function for Windows (only) |