Hi, as in subject.

The patch requires to run autoheader to re-generate the config.h.in
file.

Regards.
>From c75913c29b31450936a366f4b918bb29cde461e7 Mon Sep 17 00:00:00 2001
Message-Id: <c75913c29b31450936a366f4b918bb29cde461e7.1278424181.git.ssabat...@reilabs.com>
In-Reply-To: <df35791318679319f17f1ad01b104a6dca265786.1278424181.git.ssabat...@reilabs.com>
References: <df35791318679319f17f1ad01b104a6dca265786.1278424181.git.ssabat...@reilabs.com>
From: Stefano Sabatini <ssabat...@reilabs.com>
Date: Tue, 6 Jul 2010 15:43:13 +0200
Subject: [fix-mingw-compilation PATCH 2/2] Avoid gai_strerror redefinition if it has been already declared.

Fix compilation on MinGW (where it is declared but not defined).
---
 libsofia-sip-ua/su/su_addrinfo.c |    4 ++++
 m4/sac-general.m4                |    6 ++++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/libsofia-sip-ua/su/su_addrinfo.c b/libsofia-sip-ua/su/su_addrinfo.c
index c8005c0..4663fee 100644
--- a/libsofia-sip-ua/su/su_addrinfo.c
+++ b/libsofia-sip-ua/su/su_addrinfo.c
@@ -820,6 +820,10 @@ freeaddrinfo(ai)
 #endif
 
 #if !HAVE_GAI_STRERROR
+#if HAVE_DECL_GAI_STRERROR
+#undef gai_strerror
+#endif
+
 static
 char *
 gai_strerror(ecode)
diff --git a/m4/sac-general.m4 b/m4/sac-general.m4
index de0ba9a..ec42733 100644
--- a/m4/sac-general.m4
+++ b/m4/sac-general.m4
@@ -359,6 +359,9 @@ fi
 ])
 
 if test "$ac_cc_environment" = mingw32 ; then
+
+AC_CHECK_DECLS([gai_strerror], [], [], [[#include <ws2tcpip.h>]])
+
 CFLAGS="$CFLAGS -I${srcdir}/win32/pthread -DWINVER=0x0501 \
 	-D_WIN32_WINNT=0x0501 -DIN_LIBSOFIA_SIP_UA -DIN_LIBSOFIA_SRES \
 	-mms-bitfields \
@@ -370,7 +373,10 @@ MINGW_ENVIRONMENT=1
 AC_SUBST(MINGW_ENVIRONMENT)
 AC_DEFINE([HAVE_MINGW], [1], [Define to 1 if you are compiling in MinGW environment])
 AC_DEFINE([HAVE_WIN32], [1], [Define to 1 if you have WIN32])
+else
+AC_CHECK_DECLS([gai_strerror])
 fi
+
 AM_CONDITIONAL([HAVE_MINGW32], [test "x$ac_cc_environment" != x])
 ])dnl
 
-- 
1.7.1

------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Sofia-sip-devel mailing list
Sofia-sip-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sofia-sip-devel

Reply via email to