[Mesa-dev] talloc (Was: Merge criteria for glsl2 branch)

[Ian Romanick]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

José Fonseca wrote:

> I've pushed a new branch glsl2-win32 that includes Aras' patch, and all
> necessary fixes to get at least MinGW build successfully.

I merged all of these.

> I had to rename some tokens in order to avoid collisions with windows.h
> defines. Aras didn't mention this problem before. Perhaps the indirect
> windows.h include can be avoided, or you prefer to handle this some
> other way.

I did the last one a little differently.  I already had CONST_TOK,
LAYOUT_TOK, and INLINE_TOK to avoid collisions with Linux headers and
other Mesa headers, so I appended _TOK to the colliding names here too.
 I think I got all of the ones from your patch, but you'll want to
double check.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkxldFIACgkQX1gOwKyEAw8i5QCeMMVifl+qxhlaQW+Sh+dwxuz3
w7IAmQGuWFwOZCf8xNlprQqMC9yIqdwO
=O+IU
-----END PGP SIGNATURE-----