[FFmpeg-devel] [PATCH] Fix MANGLE macro on MacOSX
Måns Rullgård
mans
Mon Mar 17 03:40:12 CET 2008
"?smail D?nmez" <ismail at namtrac.org> writes:
> Hi,
>
> On Mon, Mar 17, 2008 at 2:29 AM, Michael Niedermayer <michaelni at gmx.at> wrote:
>> On Sat, Mar 15, 2008 at 02:18:25AM +0200, ?smail D?nmez wrote:
>> > Hi,
>> >
>> > Attached patch fixes MANGLE macro on MacOSX, regtested with no new
>> > regressions. With this patch you can now compile a 64bit ffmpeg on
>> > MacOSX without using --disable-mmx.
>>
>> Do we have a maintainer for x86-macosx?
>
> Not sure.
>
>> anyway:
>> [...]
>> > - defined(__OS2__) || (defined (__OpenBSD__) && !defined(__ELF__))
>> > + defined(__OS2__) || (defined (__OpenBSD__) || defined(__APPLE__) && !defined(__ELF__))
>>
>> looks wrong, it changes __OpenBSD__ behavior
>
> I missed the extra parenthesis before __OPENBSD__ , fixed.
>
> Regards,
> ismail
>
> --
> Never learn by your mistakes, if you do you may never dare to try again.
>
> Index: libavutil/internal.h
> ===================================================================
> --- libavutil/internal.h (revision 12459)
> +++ libavutil/internal.h (working copy)
> @@ -120,7 +120,7 @@
>
> // Use rip-relative addressing if compiling PIC code on x86-64.
> #if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__DJGPP__) || \
> - defined(__OS2__) || (defined (__OpenBSD__) && !defined(__ELF__))
> + defined(__OS2__) || defined(__APPLE__) || (defined (__OpenBSD__) && !defined(__ELF__))
> # if defined(ARCH_X86_64) && defined(PIC)
> # define MANGLE(a) "_" #a"(%%rip)"
> # else
> @@ -129,8 +129,6 @@
> #else
> # if defined(ARCH_X86_64) && defined(PIC)
> # define MANGLE(a) #a"(%%rip)"
> -# elif defined(__APPLE__)
> -# define MANGLE(a) "_" #a
> # else
> # define MANGLE(a) #a
> # endif
This is starting to look like that infamous half-page #ifdef from
screen. Is there some way we could check the proper format in
configure instead?
--
M?ns Rullg?rd
mans at mansr.com
More information about the ffmpeg-devel
mailing list