From d2ad2e2089802066087b86d013b2628998ada208 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Fri, 20 Jan 2017 15:53:33 -0200 Subject: [PATCH] Ajustes para compilação windows. --- Makefile.in | 2 +- util.c | 2 ++ w3miscc.h | 9 +++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index c6a8d47..934d3e3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -76,7 +76,7 @@ HOST_CC=@HOST_CC@ LD=@CC@ CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ @LIBSSL_CFLAGS@ -LIBS=@LIBS@ @LIBSSL_LIBS@ +LIBS=@LIBS@ @LIBSSL_LIBS@ @LIBICONV@ LDFLAGS=@LDFLAGS@ #---[ Rules ]---------------------------------------------------------------------------- diff --git a/util.c b/util.c index b93dd29..106d0e4 100644 --- a/util.c +++ b/util.c @@ -113,6 +113,7 @@ int get_version_info(void) } // Convert a network address to a string. +#ifndef HAVE_INET_NTOP const char * inet_ntop(int af, const void *src, char *dst, socklen_t cnt) { union { @@ -150,6 +151,7 @@ const char * inet_ntop(int af, const void *src, char *dst, socklen_t cnt) return dst; } +#endif // HAVE_INET_NTOP // Decode a Win32 error number. LIB3270_EXPORT const char * lib3270_win32_strerror(int e) diff --git a/w3miscc.h b/w3miscc.h index 7eeebbb..9f7c508 100644 --- a/w3miscc.h +++ b/w3miscc.h @@ -16,7 +16,12 @@ * Miscellaneous Win32 functions. */ -#if defined(_WIN32) + #include + + #ifndef HAVE_INET_NTOP LIB3270_INTERNAL const char *inet_ntop(int af, const void *src, char *dst,socklen_t cnt); + #endif // HAVE_INET_NTOP + + #if defined(_WIN32) LIB3270_INTERNAL const char *win32_strerror(int e); -#endif + #endif // WIN32 -- libgit2 0.21.2