[MPlayer-dev-eng] [PATCH] Windows GUI with mingw64 and cygwin revised part 1

[Stephen Sheldon]

I have made the changes Diego requested, and I am resubmitting
my patch as 2 patches (one of the requests).

This one is to get around a compilation error in gui/win32/wincfg.c after a
change in gui/cfg.h.

cc -MD -MP -Wundef -Wall -Wno-switch -Wno-parentheses -Wpointer-arith
-Wredundant-decls -Werror-implicit-function-declaration -Wstrict-prototypes
-Wmissing-prototypes -Wdisabled-optimization -Wno-pointer-sign
-Wdeclaration-after-statement -std=gnu99  -O4 -march=native -mtune=native -pipe
-ffast-math -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-D_LARGEFILE64_SOURCE -Ilibdvdread4 -I. -Iffmpeg -I/usr/local/include/dx7
-fno-common  -I/usr/include/freetype2 -DFF_API_MAX_STREAMS=0
-Wno-strict-prototypes -c -o gui/win32/wincfg.o gui/win32/wincfg.c
gui/win32/wincfg.c:59: error: static declaration of 'gui_conf' follows
non-static declaration
./gui/cfg.h:24: error: previous declaration of 'gui_conf' was here
make: *** [gui/win32/wincfg.o] Error 1


Index: gui/win32/wincfg.c
===================================================================
--- gui/win32/wincfg.c	(revision 33379)
+++ gui/win32/wincfg.c	(working copy)
@@ -56,7 +56,7 @@
 int gui_sub_pos_x = -1;
 int gui_sub_pos_y = -1;
 
-static m_config_t *gui_conf;
+m_config_t *gui_conf;
 static const m_option_t gui_opts[] =
 {
     {   "priority", &proc_priority, CONF_TYPE_STRING, 0, 0, 0, NULL},