X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=6d7ce25b6790b735202c3c41100d4bd504ccc172;hb=42bb2a548d096f55bfbbb98421802e7c164e03f4;hp=b515bf1fc1b1ec399e2a36be2680a26e3f5962c4;hpb=b5390911cbc2a5f1f791f386d459d7dc5a55fc4b;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index b515bf1fc1..6d7ce25b67 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -35,9 +35,14 @@ /***************************************************************************** * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include "control/libvlc_internal.h" +#include "libvlc.h" #include @@ -114,7 +119,7 @@ int VLC_Create( void ) * - message queue, module bank and playlist initialization * - configuration and commandline parsing *****************************************************************************/ -int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] ) +int VLC_Init( int i_object, int i_argc, const char *ppsz_argv[] ) { int i_ret; LIBVLC_FUNC; @@ -147,7 +152,7 @@ int VLC_AddIntf( int i_object, char const *psz_module, /***************************************************************************** * VLC_Die: ask vlc to die. ***************************************************************************** - * This function sets p_vlc->b_die to VLC_TRUE, but does not do any other + * This function sets p_libvlc->b_die to VLC_TRUE, but does not do any other * task. It is your duty to call VLC_CleanUp and VLC_Destroy afterwards. *****************************************************************************/ int VLC_Die( int i_object )