From: Nicolas Kaiser Date: Thu, 30 Sep 2010 14:50:43 +0000 (-0700) Subject: main: remove duplicated includes X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9674929bce0c0ea4862b468d0a1a7e58b2664049;p=mesa.git main: remove duplicated includes Remove duplicated includes. Signed-off-by: Brian Paul --- diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c index b87aa47d88b..ae653e1914e 100644 --- a/src/mesa/main/api_exec.c +++ b/src/mesa/main/api_exec.c @@ -91,10 +91,7 @@ #include "mtypes.h" #include "varray.h" #include "viewport.h" -#if FEATURE_NV_vertex_program -#include "nvprogram.h" -#endif -#if FEATURE_NV_fragment_program +#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program #include "nvprogram.h" #endif #if FEATURE_ARB_shader_objects diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 3a730f0e406..cccec248539 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -52,7 +52,6 @@ #include "hash.h" #include "image.h" #include "light.h" -#include "dlist.h" #include "macros.h" #include "queryobj.h" #include "teximage.h" diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c index adc1199d87a..118fb52bb2e 100644 --- a/src/mesa/main/renderbuffer.c +++ b/src/mesa/main/renderbuffer.c @@ -46,7 +46,6 @@ #include "fbobject.h" #include "formats.h" #include "mtypes.h" -#include "fbobject.h" #include "renderbuffer.h"