Mesa (master): mesa: Fix C++ includes in sampler.cpp
Ian Romanick
idr at kemper.freedesktop.org
Tue Nov 2 17:39:05 UTC 2010
Module: Mesa
Branch: master
Commit: 223568fbcd2f4ec295d932f5d71fe4b18bb279d3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=223568fbcd2f4ec295d932f5d71fe4b18bb279d3
Author: Chad Versace <chad at chad-versace.us>
Date: Mon Nov 1 14:23:53 2010 -0700
mesa: Fix C++ includes in sampler.cpp
Some C++ header files were included in an extern "C" block. When building with
Clang, this caused the build to fail due to namespace errors. (GCC did not
report any errors.)
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
---
src/mesa/program/sampler.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/mesa/program/sampler.cpp b/src/mesa/program/sampler.cpp
index 0e58aef..9a813c8 100644
--- a/src/mesa/program/sampler.cpp
+++ b/src/mesa/program/sampler.cpp
@@ -23,15 +23,15 @@
* DEALINGS IN THE SOFTWARE.
*/
-#include <stdio.h>
+#include <cstdio>
+#include "ir.h"
+#include "glsl_types.h"
+#include "ir_visitor.h"
extern "C" {
#include "main/compiler.h"
#include "main/mtypes.h"
#include "program/prog_parameter.h"
-#include "ir.h"
-#include "ir_visitor.h"
-#include "glsl_types.h"
}
static void fail_link(struct gl_shader_program *prog, const char *fmt, ...) PRINTFLIKE(2, 3);
More information about the mesa-commit
mailing list