# HG changeset patch # User ib # Date 1310118722 0 # Node ID 16286ee1fc7187f6d8b2ac5b2046f379fd9b1b4e # Parent 84b3eebfd796a80c971084e50fb447c9c97fca4e 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. diff -r 84b3eebfd796 -r 16286ee1fc71 gui/win32/dialogs.c --- a/gui/win32/dialogs.c Thu Jul 07 23:06:29 2011 +0000 +++ b/gui/win32/dialogs.c Fri Jul 08 09:52:02 2011 +0000 @@ -25,6 +25,7 @@ #include #include "path.h" #include "gui/interface.h" +#include "gui/ui/actions.h" #include "mp_msg.h" #include "help_mp.h" #include "mpcommon.h" diff -r 84b3eebfd796 -r 16286ee1fc71 gui/win32/gui.c --- a/gui/win32/gui.c Thu Jul 07 23:06:29 2011 +0000 +++ b/gui/win32/gui.c Fri Jul 08 09:52:02 2011 +0000 @@ -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" diff -r 84b3eebfd796 -r 16286ee1fc71 gui/win32/interface.c --- a/gui/win32/interface.c Thu Jul 07 23:06:29 2011 +0000 +++ b/gui/win32/interface.c Fri Jul 08 09:52:02 2011 +0000 @@ -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 @@ 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 @@ * \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; diff -r 84b3eebfd796 -r 16286ee1fc71 gui/win32/preferences.c --- a/gui/win32/preferences.c Thu Jul 07 23:06:29 2011 +0000 +++ b/gui/win32/preferences.c Fri Jul 08 09:52:02 2011 +0000 @@ -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" diff -r 84b3eebfd796 -r 16286ee1fc71 gui/win32/skinload.c --- a/gui/win32/skinload.c Thu Jul 07 23:06:29 2011 +0000 +++ b/gui/win32/skinload.c Fri Jul 08 09:52:02 2011 +0000 @@ -21,6 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include #include