aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--src/libid3tag/config.h.in6
-rw-r--r--src/libmad/config.h.in6
3 files changed, 8 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 9b73748b3..589135365 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,8 +56,6 @@ AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(long long)
-AC_CHECK_FUNCS(strsep)
-
AC_CHECK_LIB(socket,socket,MPD_LIBS="$MPD_LIBS -lsocket",)
AC_CHECK_LIB(nsl,gethostbyname,MPD_LIBS="$MPD_LIBS -lnsl",)
diff --git a/src/libid3tag/config.h.in b/src/libid3tag/config.h.in
index b4f0f8997..ba35b4be9 100644
--- a/src/libid3tag/config.h.in
+++ b/src/libid3tag/config.h.in
@@ -72,6 +72,8 @@
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
- if it is not supported. */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+ calls it, or to nothing if 'inline' is not supported under any name. */
+#ifndef __cplusplus
#undef inline
+#endif
diff --git a/src/libmad/config.h.in b/src/libmad/config.h.in
index 2a9671cd2..a29b58209 100644
--- a/src/libmad/config.h.in
+++ b/src/libmad/config.h.in
@@ -125,9 +125,11 @@
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
- if it is not supported. */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+ calls it, or to nothing if 'inline' is not supported under any name. */
+#ifndef __cplusplus
#undef inline
+#endif
/* Define to `int' if <sys/types.h> does not define. */
#undef pid_t