[MPlayer-dev-eng] [BUG]: compile error on Darwin/ppc 6.8

[Nicolas Plourde]

Nicolas Plourde wrote:

> Christoph Egger wrote:
>
>> There are two failures:
>>
>> 1)
>>
>> In file included from
>> /System/Library/Frameworks/CoreFoundation.framework/Headers/CFBase.h:18,
>>                 from
>> /System/Library/Frameworks/CoreFoundation.framework/Headers/CoreFoundation.h:5, 
>>
>>                 from vcd_read_darwin.h:2,
>>                 from
>> stream_vcd.c:23:
>> /System/Library/Frameworks/CoreServices.framework/Headers/../Frameworks/CarbonCore.framework/Headers/MacTypes.h:75: 
>>
>> error: redefinition of `struct
>> wide'
>> /System/Library/Frameworks/CoreServices.framework/Headers/../Frameworks/CarbonCore.framework/Headers/MacTypes.h:80: 
>>
>> error: redefinition of `struct UnsignedWide'
>> make[1]: *** [stream_vcd.o] Error 1
>> make: *** [libmpdemux/libmpdemux.a] Error 2
>>
>>
>> 2) See TOOLS/subfont-c/Makefile
>> There's this line:
>>
>> LDLIBS=-lm ../../osdep/timer-lx.o $(shell freetype-config --libs)
>>
>> the correct line to work on darwin is this:
>>
>> LDLIBS=-lm ../../osdep/timer-darwin.o $(shell freetype-config --libs)
>> -liconv
>>
>>  
>>
> struct wide and struct UnsignedWide should not be redifined of course. 
> In darwin 7.5 MacTypes.h header files
> there is a case #ifndef _OS_OSTYPES_H im not sure if this is in 6.8.
>
> This is pobably caused by a missing header file in vcd_read_darwin.h 
> or something changed from 6.8 to 7.5.
>
maybe replacing this in vcd_read_darwin.h will fix this

#include <IOKit/storage/IOCDMediaBSDClient.h>
#include <CoreFoundation/CoreFoundation.h>

by this

#include <sys/types.h>
#include <CoreFoundation/CFBase.h>
#include <IOKit/IOKitLib.h>
#include <IOKit/storage/IOCDTypes.h>
#include <IOKit/storage/IOCDMedia.h>
#include <IOKit/storage/IOCDMediaBSDClient.h>



-- 
====
Nicolas Plourde <nicolas.plourde at sympatico.ca>