[vlc-devel] commit: Fix warnings ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Sat Mar 29 11:27:56 2008 +0200| [b8610e40d930eac206289ca29ae096b66f0f1942]

Fix warnings

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b8610e40d930eac206289ca29ae096b66f0f1942
---

 src/libvlc.h                        |    2 +-
 src/misc/objects.c                  |    4 ++--
 src/video_output/vout_subpictures.c |    1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/libvlc.h b/src/libvlc.h
index 30a2137..043becc 100644
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -87,7 +87,7 @@ uint32_t CPUCapabilities( void );
  * @param psz_type object type name
  * @return the created object, or NULL.
  */
-extern vlc_object_t *
+extern void *
 vlc_custom_create (vlc_object_t *p_this, size_t i_size, int i_type,
                    const char *psz_type);
 
diff --git a/src/misc/objects.c b/src/misc/objects.c
index 440a739..a7e4880 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -104,8 +104,8 @@ static void vlc_object_yield_locked( vlc_object_t *p_this );
 static vlc_mutex_t    structure_lock;
 static vlc_object_internals_t global_internals;
 
-vlc_object_t *vlc_custom_create( vlc_object_t *p_this, size_t i_size,
-                                 int i_type, const char *psz_type )
+void *vlc_custom_create( vlc_object_t *p_this, size_t i_size,
+                         int i_type, const char *psz_type )
 {
     vlc_object_t *p_new;
     vlc_object_internals_t *p_priv;
diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index d9065df..9dccc53 100644
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -35,6 +35,7 @@
 #include <vlc_block.h>
 #include <vlc_filter.h>
 #include <vlc_osd.h>
+#include "../libvlc.h"
 
 /*****************************************************************************
  * Local prototypes