X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_vlm.h;h=12a0eda4979b1e1bc507794d89e5794e6911e97a;hb=c652885eba933daacfe7d06c8b4f5f93191ba5cd;hp=6c9087685ae767226a0334072c9019b1132610cf;hpb=92f1b3aee74871e264db419def5170f2e3512751;p=vlc diff --git a/include/vlc_vlm.h b/include/vlc_vlm.h index 6c9087685a..12a0eda497 100644 --- a/include/vlc_vlm.h +++ b/include/vlc_vlm.h @@ -1,25 +1,25 @@ /***************************************************************************** * vlc_vlm.h: VLM core structures ***************************************************************************** - * Copyright (C) 2000, 2001 the VideoLAN team + * Copyright (C) 2000, 2001 VLC authors and VideoLAN * $Id$ * * Authors: Simon Latapie * Laurent Aimar * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #ifndef VLC_VLM_H @@ -236,9 +236,9 @@ vlm_media_Copy( vlm_media_t *p_dst, const vlm_media_t *p_src ) p_dst->psz_name = strdup( p_src->psz_name ); for( i = 0; i < p_src->i_input; i++ ) - TAB_APPEND_CPP( char, p_dst->i_input, p_dst->ppsz_input, strdup(p_src->ppsz_input[i]) ); + TAB_APPEND_CAST( (char**), p_dst->i_input, p_dst->ppsz_input, strdup(p_src->ppsz_input[i]) ); for( i = 0; i < p_src->i_option; i++ ) - TAB_APPEND_CPP( char, p_dst->i_option, p_dst->ppsz_option, strdup(p_src->ppsz_option[i]) ); + TAB_APPEND_CAST( (char**), p_dst->i_option, p_dst->ppsz_option, strdup(p_src->ppsz_option[i]) ); if( p_src->psz_output ) p_dst->psz_output = strdup( p_src->psz_output );