From c053f4ab75aaa33b37c99243abfa12c898a8ad2b Mon Sep 17 00:00:00 2001 From: Pierre d'Herbemont Date: Thu, 20 Aug 2009 18:48:45 +0200 Subject: [PATCH] Revert "network: Remove an unused label." This reverts commit 663411401 and correctly undefine out: if needed. --- configure.ac | 4 +++- src/network/getaddrinfo.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4a88e5b25d..48a0eb022e 100644 --- a/configure.ac +++ b/configure.ac @@ -1011,7 +1011,9 @@ AC_ARG_ENABLE(warnings-as-error, if test "x${warnings_as_error}" = "xyes" -o "x${enable_debug}" != "xno" then RDC_PROG_CC_WERRORFLAGS([unused-function unused-label unused-value unused-parameter unused-variable unused \ - missing-parameter-type missing-declarations undef address enum-compare implicit-int implicit-function-declaration comment format main missing-braces nonnull parentheses pointer-sign reorder return-type sequence-point switch trigraphs uninitialized]) + missing-parameter-type missing-declarations undef address enum-compare implicit-int implicit-function-declaration \ + comment format format-security format-nonliteral main missing-braces nonnull parentheses pointer-sign reorder return-type sequence-point switch trigraphs uninitialized \ + bad-function-cast end]) fi dnl Check for various optimization flags diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c index 1e3d08b4e8..dcea956dc2 100644 --- a/src/network/getaddrinfo.c +++ b/src/network/getaddrinfo.c @@ -689,6 +689,9 @@ int vlc_getaddrinfo( vlc_object_t *p_this, const char *node, #endif ret = getaddrinfo (node, psz_service, &hints, res); +#if defined(AI_IDN) || defined(WIN32) +out: +#endif LocaleFree (node); return ret; } -- 2.39.2