[Mesa-dev] [PATCH] mesa/program: Fix C++ includes in sampler.cpp

[Brian Paul]

On 11/01/2010 03:23 PM, Chad Versace wrote:
> 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.)
> ---
>   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);

Looks good to me.

-Brian