diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-23 07:54:10 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-23 07:54:10 +0000 |
commit | 5405958e341f4de535d60b0f6eb13bcc6091f956 (patch) | |
tree | 8b28581353f8069304c3fb00481d96a3d683164f | |
parent | 9c0f9900ee92f1fae5901aeec00fe088d7227aa0 (diff) |
Add header for macosx_finder_args() instead of forward declaring it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30717 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | osdep/macosx_finder_args.c | 1 | ||||
-rw-r--r-- | osdep/macosx_finder_args.h | 26 | ||||
-rw-r--r-- | parser-mpcmd.c | 4 |
3 files changed, 28 insertions, 3 deletions
diff --git a/osdep/macosx_finder_args.c b/osdep/macosx_finder_args.c index 81c1959894..cbd88ad4ac 100644 --- a/osdep/macosx_finder_args.c +++ b/osdep/macosx_finder_args.c @@ -23,6 +23,7 @@ #include "m_option.h" #include "m_config.h" #include "playtree.h" +#include "macosx_finder_args.h" static play_tree_t *files=NULL; diff --git a/osdep/macosx_finder_args.h b/osdep/macosx_finder_args.h new file mode 100644 index 0000000000..fd047181a4 --- /dev/null +++ b/osdep/macosx_finder_args.h @@ -0,0 +1,26 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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 + * (at your option) any later version. + * + * MPlayer 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. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_MACOSX_FINDER_ARGS_H +#define MPLAYER_MACOSX_FINDER_ARGS_H + +#include "playtree.h" + +play_tree_t *macosx_finder_args(m_config_t *config, int argc, char **argv); + +#endif /* MPLAYER_MACOSX_FINDER_ARGS_H */ diff --git a/parser-mpcmd.c b/parser-mpcmd.c index b493ddf089..b03bcfb05a 100644 --- a/parser-mpcmd.c +++ b/parser-mpcmd.c @@ -36,6 +36,7 @@ #include "m_config.h" #include "playtree.h" #include "parser-mpcmd.h" +#include "osdep/macosx_finder_args.h" static int recursion_depth = 0; static int mode = 0; @@ -91,9 +92,6 @@ m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv) int no_more_opts = 0; int opt_exit = 0; // flag indicating whether mplayer should exit without playing anything play_tree_t *last_parent, *last_entry = NULL, *root; -#ifdef CONFIG_MACOSX_FINDER - play_tree_t *macosx_finder_args(m_config_t *, int , char **); -#endif #ifdef MP_DEBUG assert(config != NULL); |