From 2219a775c4271a2c1c80da0fc539a630d63c1e04 Mon Sep 17 00:00:00 2001
From: Peter Meerwald
Date: Tue, 10 Jul 2012 14:44:03 +0200
Subject: [PATCH] daemon: Fix redundant redeclaration warning
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
CC pulseaudio-dumpmodules.o
daemon/dumpmodules.c:93:27: warning: redundant redeclaration of âlt__PROGRAM__LTX_preloaded_symbolsâ [-Wredundant-decls]
/usr/include/ltdl.h:106:36: note: previous declaration of âlt__PROGRAM__LTX_preloaded_symbolsâ was here
the declaration is provided by ltld.h of libtool since version 2.4, require the 2.4 instead of 2.2
Signed-off-by: Peter Meerwald
---
configure.ac | 9 ++-------
src/daemon/dumpmodules.c | 4 ----
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/configure.ac b/configure.ac
index 546fcb0..2154429 100644
--- a/configure.ac
+++ b/configure.ac
@@ -320,14 +320,9 @@ esac
#### libtool stuff ####
-LT_PREREQ(2.2)
+LT_PREREQ(2.4)
LT_INIT([dlopen win32-dll disable-static])
-dnl Unfortunately, even up to libtool 2.2.6a there is no way to know
-dnl exactly which version of libltdl is present in the system, so we
-dnl just assume that it's a working version as long as we have the
-dnl library and the header files.
-dnl
dnl As an extra safety device, check for lt_dladvise_init() which is
dnl only implemented in libtool 2.x, and refine as we go if we have
dnl refined requirements.
@@ -345,7 +340,7 @@ AC_CHECK_HEADER([ltdl.h],
[LIBLTDL=])
AS_IF([test "x$LIBLTDL" = "x"],
- [AC_MSG_ERROR([Unable to find libltdl version 2. Makes sure you have libtool 2.2 or later installed.])])
+ [AC_MSG_ERROR([Unable to find libltdl version 2. Makes sure you have libtool 2.4 or later installed.])])
AC_SUBST([LIBLTDL])
diff --git a/src/daemon/dumpmodules.c b/src/daemon/dumpmodules.c
index 6f45e12..0529e04 100644
--- a/src/daemon/dumpmodules.c
+++ b/src/daemon/dumpmodules.c
@@ -89,10 +89,6 @@ static void show_info(const char *name, const char *path, void (*info)(const cha
}
}
-#ifndef OS_IS_WIN32
-extern const lt_dlsymlist lt_preloaded_symbols[];
-#endif
-
static int is_preloaded(const char *name) {
const lt_dlsymlist *l;
--
2.7.4