diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-11-30 00:53:50 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-11-30 00:53:50 +0000 |
| commit | 873578a7965683e3e76420731c1d571908b54848 (patch) | |
| tree | cd8153e478f39f9aac7c851672996a8e58ace71e /src/input/input_file.c | |
| parent | ad5f52afbed82f29ba0816255edf1ff63533a2ff (diff) | |
| download | xine-lib-873578a7965683e3e76420731c1d571908b54848.tar.gz xine-lib-873578a7965683e3e76420731c1d571908b54848.tar.bz2 | |
Valid mrls are no more static (except few ones), like file suffix too.
First draft of compat.h (almost empty for now).
CVS patchset: 1139
CVS date: 2001/11/30 00:53:50
Diffstat (limited to 'src/input/input_file.c')
| -rw-r--r-- | src/input/input_file.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/input/input_file.c b/src/input/input_file.c index ae7267a2b..771108769 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_file.c,v 1.29 2001/11/18 03:53:23 guenter Exp $ + * $Id: input_file.c,v 1.30 2001/11/30 00:53:51 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -37,14 +37,11 @@ #include "xine_internal.h" #include "xineutils.h" +#include "compat.h" #include "input_plugin.h" extern int errno; -#ifndef __GNUC__ -#define __FUNCTION__ __func__ -#endif - #define MAXFILES 65535 #ifndef NAME_MAX @@ -456,7 +453,7 @@ static mrl_t **file_plugin_get_dir (input_plugin_t *this_gen, if(linksize < 0) { fprintf(stderr, "%s(%d): readlink() failed: %s\n", - __FUNCTION__, __LINE__, strerror(errno)); + __XINE_FUNCTION__, __LINE__, strerror(errno)); } else { dir_files[num_dir_files].link = (char *) xine_xmalloc(linksize + 1); @@ -490,7 +487,7 @@ static mrl_t **file_plugin_get_dir (input_plugin_t *this_gen, if(linksize < 0) { fprintf(stderr, "%s(%d): readlink() failed: %s\n", - __FUNCTION__, __LINE__, strerror(errno)); + __XINE_FUNCTION__, __LINE__, strerror(errno)); } else { hide_files[num_hide_files].link = (char *) @@ -524,7 +521,7 @@ static mrl_t **file_plugin_get_dir (input_plugin_t *this_gen, if(linksize < 0) { fprintf(stderr, "%s(%d): readlink() failed: %s\n", - __FUNCTION__, __LINE__, strerror(errno)); + __XINE_FUNCTION__, __LINE__, strerror(errno)); } else { norm_files[num_norm_files].link = (char *) |