aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-03-06 15:59:22 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-03-06 15:59:22 +0000
commitac8884d3a530d8fb1573c8715797035e37586621 (patch)
tree9507ea3034b47415ad89e0c732552c175a466fc6 /src
parent9ddfd9aa502ee36ef715943dbb4e2dd79b144efe (diff)
downloadmpd-ac8884d3a530d8fb1573c8715797035e37586621.tar.gz
mpd-ac8884d3a530d8fb1573c8715797035e37586621.tar.xz
mpd-ac8884d3a530d8fb1573c8715797035e37586621.zip
git-svn-id: https://svn.musicpd.org/mpd/trunk@213 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src')
-rw-r--r--src/libid3tag/config.h.in6
-rw-r--r--src/libmad/config.h.in6
2 files changed, 8 insertions, 4 deletions
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