[MPlayer-cvslog] r30355 - in trunk: libaf/af.c libmpcodecs/ve_lavc.c libmpdemux/mf.c osdep/strsep.c osdep/strsep.h

[reimar]

Author: reimar
Date: Sun Jan 17 16:08:31 2010
New Revision: 30355

Log:
Add a proper header for our strsep implementation so strsep will
not be used without a declaration, causing issues on 64 bit systems.

Added:
   trunk/osdep/strsep.h
Modified:
   trunk/libaf/af.c
   trunk/libmpcodecs/ve_lavc.c
   trunk/libmpdemux/mf.c
   trunk/osdep/strsep.c

Modified: trunk/libaf/af.c
==============================================================================
--- trunk/libaf/af.c	Sun Jan 17 15:58:44 2010	(r30354)
+++ trunk/libaf/af.c	Sun Jan 17 16:08:31 2010	(r30355)
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "osdep/strsep.h"
 
 #include "af.h"
 

Modified: trunk/libmpcodecs/ve_lavc.c
==============================================================================
--- trunk/libmpcodecs/ve_lavc.c	Sun Jan 17 15:58:44 2010	(r30354)
+++ trunk/libmpcodecs/ve_lavc.c	Sun Jan 17 16:08:31 2010	(r30355)
@@ -15,6 +15,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "av_opts.h"
+#include "osdep/strsep.h"
 
 #include "codec-cfg.h"
 #include "stream/stream.h"

Modified: trunk/libmpdemux/mf.c
==============================================================================
--- trunk/libmpdemux/mf.c	Sun Jan 17 15:58:44 2010	(r30354)
+++ trunk/libmpdemux/mf.c	Sun Jan 17 16:08:31 2010	(r30355)
@@ -33,6 +33,7 @@
 #else
 #include "osdep/glob.h"
 #endif
+#include "osdep/strsep.h"
 
 #include "mp_msg.h"
 #include "help_mp.h"

Modified: trunk/osdep/strsep.c
==============================================================================
--- trunk/osdep/strsep.c	Sun Jan 17 15:58:44 2010	(r30354)
+++ trunk/osdep/strsep.c	Sun Jan 17 16:08:31 2010	(r30355)
@@ -22,6 +22,7 @@
 #include <string.h>
 
 #include "config.h"
+#include "strsep.h"
 
 char *strsep(char **stringp, const char *delim) {
   char *begin, *end;

Added: trunk/osdep/strsep.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/osdep/strsep.h	Sun Jan 17 16:08:31 2010	(r30355)
@@ -0,0 +1,30 @@
+/*
+ * strsep implementation for systems that do not have it in libc
+ *
+ * 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_STRSEP_H
+#define MPLAYER_STRSEP_H
+
+#include <string.h>
+#include "config.h"
+
+#ifndef HAVE_STRSEP
+char *strsep(char **stringp, const char *delim);
+#endif
+
+#endif /* MPLAYER_STRSEP_H */