[MPlayer-dev-eng] [PATCH RESEND] Mac OS X: fix libao2 compilation on Mac OS X 10.4

[Diego Biurrun]

On Wed, Jan 05, 2011 at 08:56:47PM +0100, Benoît Amiaux wrote:
>
> On 05/01/11 11:49, Diego Biurrun wrote:
>> On Sun, Dec 19, 2010 at 04:38:52PM +0200, Aaro Koskinen wrote:
>>>
>>> On Wed, 15 Dec 2010, Diego Biurrun wrote:
>>>> On Fri, Dec 10, 2010 at 11:48:55PM +0200, Aaro Koskinen wrote:
>>>>> +#define AudioDeviceIOProcID AudioDeviceIOProc
>>>>> +#define AudioDeviceDestroyIOProcID AudioDeviceRemoveIOProc
>>>>> +static OSStatus AudioDeviceCreateIOProcID(AudioDeviceID dev,
>>>>> +					  AudioDeviceIOProc proc,
>>>>> +					  void *data,
>>>>> +					  AudioDeviceIOProcID *procid)
>>>>> +{
>>>>> +	*procid = proc;
>>>>> +	return AudioDeviceAddIOProc(dev, proc, data);
>>>>> +}
>>>>> +#endif
>>>>> +
>>>>>   typedef struct ao_coreaudio_s
>>>>>   {
>>>>
>>>> Please place your function below the struct declaration.
>>>
>>> I can move it if that's needed, I just wanted to avoid creating multiple
>>> #if ... #endif sections.
>>
>> I don't see why moving the function a few lines down would entail adding
>> more #ifdefs.
>
> Diego, you need to have this #ifdef hunk *before* the struct because it  
> redefines AudioDeviceIOProcID which is used in the struct.
>
> I like this patch because it's easy to remove/ignore. Please apply for  
> those poor souls who use OS X 10.4.

I would gladly commit it if I were given a patch that applies cleanly.

Diego