Page MenuHomeFreeBSD
Differential D16840 Diff 47478 multimedia/libxine/files/patch-include-xine-xineutils.h

Changeset View

Standalone View

View Options

multimedia/libxine/files/patch-include-xine-xineutils.h

Unbreak build of phonon-xine
In file included from xine/plugins.c:23:
In file included from /usr/local/include/xine/input_plugin.h:27:
/usr/local/include/xine/xineutils.h:197:8: error: unknown type name 'inline'
static inline void _x_freep(void *ptr) {
^
/usr/local/include/xine/xineutils.h:197:15: error: expected identifier or '('
static inline void _x_freep(void *ptr) {
^
--- include/xine/xineutils.h.orig --- include/xine/xineutils.h.orig
+++ include/xine/xineutils.h +++ include/xine/xineutils.h
@@ -146,7 +146,7 @@ void *xine_xcalloc(size_t nmemb, size_t @@ -146,7 +146,7 @@ void *xine_xcalloc(size_t nmemb, size_t
* Free allocated memory and set pointer to NULL * Free allocated memory and set pointer to NULL
* @param ptr Pointer to the pointer to the memory block which should be freed. * @param ptr Pointer to the pointer to the memory block which should be freed.
*/ */
-static inline void _x_freep(void *ptr) { -static inline void _x_freep(void *ptr) {
+static void _x_freep(void *ptr) { +static void _x_freep(void *ptr) {
void **p = (void **)ptr; void **p = (void **)ptr;
free (*p); free (*p);
*p = NULL; *p = NULL;
tobikAuthorUnsubmitted
Not Done
Inline Actions

Patch is needed for building multimedia/phonon-xine:

In file included from xine/plugins.c:23:
In file included from /usr/local/include/xine/input_plugin.h:27:
/usr/local/include/xine/xineutils.h:197:8: error: unknown type name 'inline'
static inline void _x_freep(void *ptr) {
       ^
/usr/local/include/xine/xineutils.h:197:15: error: expected identifier or '('
static inline void _x_freep(void *ptr) {
              ^
2 errors generated.

I suppose we could add USE_CSTD=c99 to phonon-xine, but I think I prefer to just keep this patch.

tobik: Patch is needed for building multimedia/phonon-xine: ``` In file included from xine/plugins.c…