-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 07/18/2011 02:28 PM, Paul Berry wrote: > On 18 July 2011 11:58, Brian Paul <bri...@vmware.com> wrote: >> On 07/18/2011 12:37 PM, Paul Berry wrote: >>> >>> Several headers redundantly define the INLINE macro. Adding this >>> guard prevents the compiler from complaining about macro redefinition. >> >> Other Mesa headers? Or system headers? Or? > > Other Mesa headers. I found definitions of INLINE in four header files: > > src/egl/main/eglcompiler.h > src/gallium/include/pipe/p_compiler.h > src/mapi/mapi/u_compiler.h > src/mesa/main/compiler.h
None of those headers should ever cross paths. The only one of those that anything under src/mesa/main or src/glsl should *ever* hit is src/mesa/main/compiler.h. Where did the colliding definition come from? > Ideally we should put all of our definitions of INLINE in one place, > but I was doing enough in other parts of the patch series that I > didn't want to shave that particular yak :) > > I'll update the commit comment to clarify. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/ iEYEARECAAYFAk4l5e0ACgkQX1gOwKyEAw+QVwCgk1cdXMlGsADztGASrpRnNnXR XVcAoJPPwaYzwNEkDtB+H2hZbqNTqXzh =XXUE -----END PGP SIGNATURE----- _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev