[libav-devel] [PATCH 2/4] Move clipd macros to x86util.asm.

[Ronald S. Bultje]

Hi,

On Sun, Jul 24, 2011 at 7:51 PM, Daniel Kang <daniel.d.kang at gmail.com> wrote:
> On Sun, Jul 24, 2011 at 10:28 PM, Ronald S. Bultje <rsbultje at gmail.com>
> wrote:
>>
>> This allows sharing them between multiple .asm files.
>> ---
>>  libavcodec/x86/dsputil_yasm.asm |   34 +---------------------------------
>>  libavutil/x86/x86util.asm       |   33 +++++++++++++++++++++++++++++++++
>>  2 files changed, 34 insertions(+), 33 deletions(-)
>>
>> diff --git a/libavcodec/x86/dsputil_yasm.asm
>> b/libavcodec/x86/dsputil_yasm.asm
>> index c75bd5c..a95ba8e 100644
>> --- a/libavcodec/x86/dsputil_yasm.asm
>> +++ b/libavcodec/x86/dsputil_yasm.asm
>> @@ -20,6 +20,7 @@
>>
>>  ;******************************************************************************
>>
>>  %include "libavutil/x86/x86inc.asm"
>> +%include "libavutil/x86/x86util.asm"
>
> Will this cause multiple definitions of macros (if a file includes
> both dsputil_yasm.asm and x86util.asm)? If I remember correctly, yasm
> doesn't like multiple definitions of macros.

I would say including dsputil_yasm.asm is a bug. It's like including dsputil.c.

Ronald