[MPlayer-cvslog] r34733 - in trunk: libao2/ao_sdl.c libvo/sdl_common.c libvo/vo_sdl.c osdep/setenv.c osdep/setenv.h

[al]

Author: al
Date: Sat Feb 18 01:08:30 2012
New Revision: 34733

Log:
Fix compiling with osdep setenv

  Since we have -Werror-implicit-function-declaration in CFLAGS,
we need a prototype for the osdep setenv() implementation.

Reported-by: redxii (in #mplayer IRC channel)

Added:
   trunk/osdep/setenv.h
Modified:
   trunk/libao2/ao_sdl.c
   trunk/libvo/sdl_common.c
   trunk/libvo/vo_sdl.c
   trunk/osdep/setenv.c

Modified: trunk/libao2/ao_sdl.c
==============================================================================
--- trunk/libao2/ao_sdl.c	Fri Feb 17 21:07:21 2012	(r34732)
+++ trunk/libao2/ao_sdl.c	Sat Feb 18 01:08:30 2012	(r34733)
@@ -37,6 +37,7 @@
 #include <SDL.h>
 #endif
 #include "osdep/timer.h"
+#include "osdep/setenv.h"
 
 #include "libavutil/fifo.h"
 

Modified: trunk/libvo/sdl_common.c
==============================================================================
--- trunk/libvo/sdl_common.c	Fri Feb 17 21:07:21 2012	(r34732)
+++ trunk/libvo/sdl_common.c	Sat Feb 18 01:08:30 2012	(r34733)
@@ -22,6 +22,7 @@
 #include "mp_msg.h"
 #include "mp_fifo.h"
 #include "osdep/keycodes.h"
+#include "osdep/setenv.h"
 #include "input/input.h"
 #include "input/mouse.h"
 #include "video_out.h"

Modified: trunk/libvo/vo_sdl.c
==============================================================================
--- trunk/libvo/vo_sdl.c	Fri Feb 17 21:07:21 2012	(r34732)
+++ trunk/libvo/vo_sdl.c	Sat Feb 18 01:08:30 2012	(r34733)
@@ -67,6 +67,7 @@
 #include "sub/sub.h"
 #include "aspect.h"
 #include "libmpcodecs/vfcap.h"
+#include "osdep/setenv.h"
 
 #ifdef CONFIG_X11
 #include <X11/Xlib.h>

Modified: trunk/osdep/setenv.c
==============================================================================
--- trunk/osdep/setenv.c	Fri Feb 17 21:07:21 2012	(r34732)
+++ trunk/osdep/setenv.c	Sat Feb 18 01:08:30 2012	(r34733)
@@ -27,6 +27,8 @@
 #endif
 #include <assert.h>
 
+#include "setenv.h"
+
 int setenv(const char *name, const char *val, int overwrite)
 {
   int len  = strlen(name) + strlen(val) + 2;

Added: trunk/osdep/setenv.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/osdep/setenv.h	Sat Feb 18 01:08:30 2012	(r34733)
@@ -0,0 +1,28 @@
+/*
+ * 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_SETENV_H
+#define MPLAYER_SETENV_H
+
+#include "config.h"
+
+#if !HAVE_SETENV
+int setenv(const char *name, const char *val, int overwrite);
+#endif
+
+#endif /* MPLAYER_SETENV_H */