On Son, 2011-07-31 at 09:47 -0700, Jeremy Huddleston wrote: > Module: Mesa > Branch: master > Commit: e737a99a6fbafe3ba4b5175eea25d1598dbeb9d8 > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=e737a99a6fbafe3ba4b5175eea25d1598dbeb9d8 > > Author: Jeremy Huddleston <jerem...@apple.com> > Date: Sun Jul 31 09:21:56 2011 -0700 > > Fix PPC detection on darwin > > Fixes regression introduced by 7004582c1894ede839c44e292b413fe4916d7e9e > > Signed-off-by: Jeremy Huddleston <jerem...@apple.com> > > --- > > src/gallium/include/pipe/p_config.h | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/gallium/include/pipe/p_config.h > b/src/gallium/include/pipe/p_config.h > index eea3d79..803b806 100644 > --- a/src/gallium/include/pipe/p_config.h > +++ b/src/gallium/include/pipe/p_config.h > @@ -99,9 +99,9 @@ > #endif > #endif > > -#if defined(__PPC__) > +#if defined(__ppc__) || defined(__ppc64__) || defined(__PPC__) > #define PIPE_ARCH_PPC > -#if defined(__PPC64__) > +#if defined(__ppc64__) || defined(__PPC64__) > #define PIPE_ARCH_PPC_64 > #endif > #endif
This will result in both PIPE_ARCH_PPC and PIPE_ARCH_PPC_64 being defined when __ppc64__ is defined. AFAICT the intention is for only one PIPE_ARCH_* to be defined. -- Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Debian, X and DRI developer _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
