mesa,glsl: rename `interface` to `programInterface`.

Graphics / Mesa 3D Graphics Library / Mesa - Jose Fonseca [vmware.com] - 16 April 2015 04:23 UTC

`interface` is a define on Windows -- an alias for `struct` keyword, used when declaring COM interfaces in C or C++.

So use instead `programInterface`, therefore matching the name used in GL_ARB_program_interface_query spec/headers, which was renamed exactly for the same reason:

"Revision 10, May 10, 2012 (pbrown)- Rename the formal parameter used by the functions in this extension to . Certain versions of the Microsoft C/C++ compiler and/or its headers cause "interface" to be treated as a reserved keyword."

Trivial.

037e0e7 mesa,glsl: rename `interface` to `programInterface`.
src/glsl/linker.cpp | 8 ++++----
src/mesa/main/shader_query.cpp | 30 +++++++++++++++---------------
src/mesa/main/shaderapi.h | 12 ++++++------
3 files changed, 25 insertions(+), 25 deletions(-)

Upstream: cgit.freedesktop.org


  • Share