From aa5baf1d50bb8ef50b0d832a17d558b6ced31096 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 16 Feb 2017 15:16:43 +0000 Subject: [PATCH] i915: remove extern "C" guards None of this code is used in C++ context. Signed-off-by: Emil Velikov Reviewed-by: Brian Paul --- src/mesa/drivers/dri/i915/intel_batchbuffer.h | 8 -------- src/mesa/drivers/dri/i915/intel_context.h | 8 -------- src/mesa/drivers/dri/i915/intel_fbo.h | 8 -------- src/mesa/drivers/dri/i915/intel_mipmap_tree.h | 8 -------- src/mesa/drivers/dri/i915/intel_regions.h | 8 -------- 5 files changed, 40 deletions(-) diff --git a/src/mesa/drivers/dri/i915/intel_batchbuffer.h b/src/mesa/drivers/dri/i915/intel_batchbuffer.h index c4efa76..9ebc61f 100644 --- a/src/mesa/drivers/dri/i915/intel_batchbuffer.h +++ b/src/mesa/drivers/dri/i915/intel_batchbuffer.h @@ -7,10 +7,6 @@ #include "intel_bufmgr.h" #include "intel_reg.h" -#ifdef __cplusplus -extern "C" { -#endif - /** * Number of bytes to reserve for commands necessary to complete a batch. * @@ -152,8 +148,4 @@ intel_batchbuffer_advance(struct intel_context *intel) #define ADVANCE_BATCH() intel_batchbuffer_advance(intel); #define CACHED_BATCH() intel_batchbuffer_cached_advance(intel); -#ifdef __cplusplus -} -#endif - #endif diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h index 139a033..d0f3d36 100644 --- a/src/mesa/drivers/dri/i915/intel_context.h +++ b/src/mesa/drivers/dri/i915/intel_context.h @@ -47,10 +47,6 @@ #include "tnl_dd/t_dd_vertex.h" #undef TAG -#ifdef __cplusplus -extern "C" { -#endif - #define DV_PF_555 (1<<8) #define DV_PF_565 (2<<8) #define DV_PF_8888 (3<<8) @@ -446,8 +442,4 @@ intel_context(struct gl_context * ctx) return (struct intel_context *) ctx; } -#ifdef __cplusplus -} -#endif - #endif diff --git a/src/mesa/drivers/dri/i915/intel_fbo.h b/src/mesa/drivers/dri/i915/intel_fbo.h index 769dab8..a30830b 100644 --- a/src/mesa/drivers/dri/i915/intel_fbo.h +++ b/src/mesa/drivers/dri/i915/intel_fbo.h @@ -36,10 +36,6 @@ #include "intel_mipmap_tree.h" #include "intel_screen.h" -#ifdef __cplusplus -extern "C" { -#endif - struct intel_context; struct intel_mipmap_tree; struct intel_texture_image; @@ -158,8 +154,4 @@ intel_renderbuffer_get_tile_offsets(struct intel_renderbuffer *irb, struct intel_region* intel_get_rb_region(struct gl_framebuffer *fb, GLuint attIndex); -#ifdef __cplusplus -} -#endif - #endif /* INTEL_FBO_H */ diff --git a/src/mesa/drivers/dri/i915/intel_mipmap_tree.h b/src/mesa/drivers/dri/i915/intel_mipmap_tree.h index 2520b30..853a4a7 100644 --- a/src/mesa/drivers/dri/i915/intel_mipmap_tree.h +++ b/src/mesa/drivers/dri/i915/intel_mipmap_tree.h @@ -34,10 +34,6 @@ #include "intel_regions.h" #include "GL/internal/dri_interface.h" -#ifdef __cplusplus -extern "C" { -#endif - /* A layer on top of the intel_regions code which adds: * * - Code to size and layout a region to hold a set of mipmaps. @@ -369,8 +365,4 @@ intel_miptree_unmap(struct intel_context *intel, unsigned int slice); -#ifdef __cplusplus -} -#endif - #endif diff --git a/src/mesa/drivers/dri/i915/intel_regions.h b/src/mesa/drivers/dri/i915/intel_regions.h index eb1c3f6..562f7cd 100644 --- a/src/mesa/drivers/dri/i915/intel_regions.h +++ b/src/mesa/drivers/dri/i915/intel_regions.h @@ -41,10 +41,6 @@ #include "main/mtypes.h" #include "intel_bufmgr.h" -#ifdef __cplusplus -extern "C" { -#endif - struct intel_context; struct intel_screen; struct intel_buffer_object; @@ -153,8 +149,4 @@ struct __DRIimageRec { void *data; }; -#ifdef __cplusplus -} -#endif - #endif -- 2.7.4