[MPlayer-dev-eng] [PATCH] _WinID multiply defined in vo_quartz.c

[Steven M. Schultz]

Hi -

	Building MPlayer on OS/X encounters a fatal linking/ranlib error because
	_WinID is defined in two places: x11_common.c and vo_quartz.c
	
Script started on Sun Jul 25 10:38:26 2004
[LARRY:src/MPlayer-cvs] sms% gmake
cc -I../libvo -I../../libvo -I/usr/X11R6/include -O4 -mcpu=970 -mtune=970 -faltivec -pipe -ffast-math -fomit-frame-pointer -DSYS_DARWIN -DCONFIG_DARWIN -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64  -Ilibmpdemux -Iloader -Ilibvo -I/usr/X11R6/include -I/usr/X11R6/include/freetype2   -I/usr/local/include/SDL -D_THREAD_SAFE -I/usr/X11R6/include    -I/usr/local/include     -o mplayer mplayer.o mp_msg.o cpudetect.o codec-cfg.o spudec.o playtree.o playtreeparser.o asxparser.o vobsub.o subreader.o sub_cc.o find_sub.o m_config.o m_option.o parser-cfg.o m_struct.o unrarlib.o mixer.o parser-mpcmd.o libvo/libvo.a libao2/libao2.a    libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a   libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a -Llibmpdvdkit2 -lmpdvdkit libavcodec/libavcodec.a libavformat/libavformat.a  -lmad -lvorbis -logg -ldv -ltheora -logg -lfaad -llzo -lmp3lame -lvorbis -logg -lxvidcore -lm -lpng -lz -lz -ljpeg     -L/usr/X11R6/lib -lfreetype -ltinfo  /usr/local/src/live/liveMedia/libliveMedia.a /usr/local/src/live/groupsock/libgroupsock.a /usr/local/src/live/UsageEnvironment/libUsageEnvironment.a /usr/local/src/live/BasicUsageEnvironment/libBasicUsageEnvironment.a -lstdc++    -framework Carbon -framework QuickTime -framework CoreAudio   -L/usr/local/lib -lfontconfig      -lGL  -lXv  -lXxf86vm -lXinerama -L/usr/X11R6/lib -lXext -lX11   -L/usr/local/lib -lSDLmain -lSDL -Wl,-framework -Wl,Cocoa -Wl,-framework -Wl,OpenGL                -liconv -lintl -lm
ld: warning table of contents of library: libvo/libvo.a not sorted slower link editing will result (use the ranlib(1) -s option)
ld: multiple definitions of symbol _WinID
libvo/libvo.a(vo_quartz.o) definition of _WinID in section (__DATA,__data)
libvo/libvo.a(x11_common.o) definition of _WinID in section (__DATA,__data)
gmake: *** [mplayer] Error 1

Script done on Sun Jul 25 10:38:30 2004

	The fix which is working for me is to change vo_quartz.c from:

	   int WinID = -1;

	to
	 
	    extern int WinID;

	Cheers,
	Steven Schultz
-------------- next part --------------
--- libvo/vo_quartz.c.dist	Fri Jul 23 18:00:20 2004
+++ libvo/vo_quartz.c	Sun Jul 25 10:40:47 2004
@@ -74,7 +74,7 @@
 extern int vo_fs; // user want fullscreen
 static int vo_quartz_fs; // we are in fullscreen
 
-int WinID = -1;
+extern int WinID;
 
 static int winLevel = 1;
 int levelList[] =