diff options
| author | José Fonseca <[email protected]> | 2011-11-09 10:20:51 +0000 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2011-11-09 10:24:37 +0000 |
| commit | 63e7a4c6e5bf51d8090046ebc5adcb4207448565 (patch) | |
| tree | b701753960e53fe36889273def9d28e0059445d6 /src/mesa/main/uniform_query.cpp | |
| parent | f4b42aa5b7a3d11f839d5576b4c42406529131be (diff) | |
mesa,glsl,mapi: Put extern "C" { ... } where appropriate.
Probably a several places missing, but enough to cover all headers
(in)directly included by uniform_query.cpp, and fix the MSVC build.
Diffstat (limited to 'src/mesa/main/uniform_query.cpp')
| -rw-r--r-- | src/mesa/main/uniform_query.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index 388e81ae236..39aa5570eca 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -22,7 +22,9 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + #include <stdlib.h> + #include "main/core.h" #include "main/context.h" #include "ir.h" @@ -30,12 +32,10 @@ #include "program/hash_table.h" #include "../glsl/program.h" #include "../glsl/ir_uniform.h" - -extern "C" { #include "main/shaderapi.h" #include "main/shaderobj.h" #include "uniforms.h" -} + extern "C" void GLAPIENTRY _mesa_GetActiveUniformARB(GLhandleARB program, GLuint index, |