[MPlayer-cvslog] r33849 - in trunk/gui/win32: dialogs.c gui.c interface.c preferences.c skinload.c

[ib]

Author: ib
Date: Fri Jul  8 11:52:02 2011
New Revision: 33849

Log:
Fix Win32 GUI compilation problems.

Add #includes to provide prototypes and change
some declarations to comply with the prototypes.

Reported by Stephen Sheldon, sfsheldo gmail com.

Modified:
   trunk/gui/win32/dialogs.c
   trunk/gui/win32/gui.c
   trunk/gui/win32/interface.c
   trunk/gui/win32/preferences.c
   trunk/gui/win32/skinload.c

Modified: trunk/gui/win32/dialogs.c
==============================================================================
--- trunk/gui/win32/dialogs.c	Fri Jul  8 01:06:29 2011	(r33848)
+++ trunk/gui/win32/dialogs.c	Fri Jul  8 11:52:02 2011	(r33849)
@@ -25,6 +25,7 @@
 #include <commctrl.h>
 #include "path.h"
 #include "gui/interface.h"
+#include "gui/ui/actions.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "mpcommon.h"

Modified: trunk/gui/win32/gui.c
==============================================================================
--- trunk/gui/win32/gui.c	Fri Jul  8 01:06:29 2011	(r33848)
+++ trunk/gui/win32/gui.c	Fri Jul  8 11:52:02 2011	(r33849)
@@ -41,6 +41,7 @@
 #include "libvo/video_out.h"
 #include "libmpcodecs/vd.h"
 #include "gui/interface.h"
+#include "gui/ui/actions.h"
 #include "gui/ui/gmplayer.h"
 #include "gui.h"
 #include "dialogs.h"

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Fri Jul  8 01:06:29 2011	(r33848)
+++ trunk/gui/win32/interface.c	Fri Jul  8 11:52:02 2011	(r33849)
@@ -48,7 +48,10 @@
 #include "access_mpcontext.h"
 #include "libmpcodecs/vd.h"
 #include "libmpcodecs/dec_audio.h"
+#include "gui/ui/actions.h"
 #include "gui/ui/gmplayer.h"
+#include "gui/util/list.h"
+#include "gui/util/string.h"
 #include "mp_core.h"
 #include "mpcommon.h"
 #include "gui.h"
@@ -96,13 +99,13 @@ char *gstrdup(const char *str)
     return strdup(str);
 }
 
-static void setdup (char **old, const char *str)
+void setdup (char **old, const char *str)
 {
   free(*old);
   *old = gstrdup(str);
 }
 
-static void setddup (char **old, const char *dir, const char *name)
+void setddup (char **old, const char *dir, const char *name)
 {
   free(*old);
   *old = malloc(strlen(dir) + strlen(name) + 2);
@@ -131,7 +134,7 @@ void gaddlist( char ***list, const char 
  * \brief this replaces a string starting with search by replace.
  * If not found, replace is appended.
  */
-static void greplace(char ***list, char *search, char *replace)
+void greplace(char ***list, const char *search, const char *replace)
 {
     int i = 0;
     int len = (search) ? strlen(search) : 0;

Modified: trunk/gui/win32/preferences.c
==============================================================================
--- trunk/gui/win32/preferences.c	Fri Jul  8 01:06:29 2011	(r33848)
+++ trunk/gui/win32/preferences.c	Fri Jul  8 11:52:02 2011	(r33849)
@@ -31,6 +31,7 @@
 #include "libao2/audio_out.h"
 #include "osdep/priority.h"
 #include "mixer.h"
+#include "gui/util/list.h"
 #include "gui/ui/gmplayer.h"
 #include "gui/interface.h"
 #include "gui.h"

Modified: trunk/gui/win32/skinload.c
==============================================================================
--- trunk/gui/win32/skinload.c	Fri Jul  8 01:06:29 2011	(r33848)
+++ trunk/gui/win32/skinload.c	Fri Jul  8 11:52:02 2011	(r33849)
@@ -21,6 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <inttypes.h>