diff options
| author | Timothy B. Terriberry <tterribe@xiph.org> | 2013-02-07 12:28:39 -0800 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2013-02-08 18:58:29 +1100 |
| commit | 81c917829a3fd0f21b35fdffb500f77d468ab4f8 (patch) | |
| tree | 16cd24df1dd0adcc0fc1256c5ffc9217ddeff6cc /src/plugin_xmms | |
| parent | 100c82e18b59be9e30247f61f0748cd59e35be34 (diff) | |
| download | flac-81c917829a3fd0f21b35fdffb500f77d468ab4f8.tar.gz | |
xmms - Fix inline linking problems with old glib
f0296255 switched to --std=c99 by default, but old glib relies on
the pre-C99 extern inline rules.
Override G_INLINE_FUNC for it to avoid multiple definition linker
errors.
Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
Diffstat (limited to 'src/plugin_xmms')
| -rw-r--r-- | src/plugin_xmms/charset.c | 4 | ||||
| -rw-r--r-- | src/plugin_xmms/configure.c | 4 | ||||
| -rw-r--r-- | src/plugin_xmms/fileinfo.c | 4 | ||||
| -rw-r--r-- | src/plugin_xmms/http.c | 5 | ||||
| -rw-r--r-- | src/plugin_xmms/plugin.c | 4 | ||||
| -rw-r--r-- | src/plugin_xmms/plugin.h | 8 | ||||
| -rw-r--r-- | src/plugin_xmms/tag.c | 4 |
7 files changed, 14 insertions, 19 deletions
diff --git a/src/plugin_xmms/charset.c b/src/plugin_xmms/charset.c index d2d39e97..2c5167fc 100644 --- a/src/plugin_xmms/charset.c +++ b/src/plugin_xmms/charset.c @@ -20,9 +20,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H -# include <config.h> -#endif +#include "plugin.h" #include <stdlib.h> #include <glib.h> diff --git a/src/plugin_xmms/configure.c b/src/plugin_xmms/configure.c index af57f52e..6b834352 100644 --- a/src/plugin_xmms/configure.c +++ b/src/plugin_xmms/configure.c @@ -21,9 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H -# include <config.h> -#endif +#include "plugin.h" #include <stdlib.h> #include <string.h> diff --git a/src/plugin_xmms/fileinfo.c b/src/plugin_xmms/fileinfo.c index 392a1288..e5e5fb15 100644 --- a/src/plugin_xmms/fileinfo.c +++ b/src/plugin_xmms/fileinfo.c @@ -18,9 +18,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., */ -#if HAVE_CONFIG_H -# include <config.h> -#endif +#include "plugin.h" #include <stdlib.h> #include <string.h> /* for strlen() */ diff --git a/src/plugin_xmms/http.c b/src/plugin_xmms/http.c index 44c9ce99..ce064471 100644 --- a/src/plugin_xmms/http.c +++ b/src/plugin_xmms/http.c @@ -17,9 +17,7 @@ */ /* modified for FLAC support by Steven Richman (2003) */ -#if HAVE_CONFIG_H -# include <config.h> -#endif +#include "plugin.h" #include <sys/types.h> #include <sys/socket.h> @@ -44,7 +42,6 @@ #include "FLAC/format.h" #include "configure.h" #include "locale_hack.h" -#include "plugin.h" /* on FreeBSD we get socklen_t from <sys/socket.h> */ #if (!defined HAVE_SOCKLEN_T) && !defined(__FreeBSD__) diff --git a/src/plugin_xmms/plugin.c b/src/plugin_xmms/plugin.c index 32ad733d..85147cf0 100644 --- a/src/plugin_xmms/plugin.c +++ b/src/plugin_xmms/plugin.c @@ -16,9 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H -# include <config.h> -#endif +#include "plugin.h" #include <limits.h> #include <pthread.h> diff --git a/src/plugin_xmms/plugin.h b/src/plugin_xmms/plugin.h index e17cb1c5..858a8741 100644 --- a/src/plugin_xmms/plugin.h +++ b/src/plugin_xmms/plugin.h @@ -19,6 +19,14 @@ #ifndef FLAC__PLUGIN_XMMS__PLUGIN_H #define FLAC__PLUGIN_XMMS__PLUGIN_H +#if HAVE_CONFIG_H +# include <config.h> +#endif + +#if defined(__GNUC_STDC_INLINE__) +# define G_INLINE_FUNC extern inline __attribute__((gnu_inline)) +#endif + void set_track_info(const char* title, int length_in_msec); #endif diff --git a/src/plugin_xmms/tag.c b/src/plugin_xmms/tag.c index 938cde8c..3012d4d0 100644 --- a/src/plugin_xmms/tag.c +++ b/src/plugin_xmms/tag.c @@ -19,9 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H -# include <config.h> -#endif +#include "plugin.h" #include <stdlib.h> #include <string.h> |