Commit 81c91782 authored by Timothy B. Terriberry's avatar Timothy B. Terriberry Committed by Erik de Castro Lopo
Browse files

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's avatarErik de Castro Lopo <erikd@mega-nerd.com>
parent 100c82e1
......@@ -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>
......
......@@ -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>
......
......@@ -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() */
......
......@@ -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__)
......
......@@ -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>
......
......@@ -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
......@@ -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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment