Mesa (master): nvfx: Clean up header file inclusion in nvfx_screen.h.

Vinson Lee vlee at kemper.freedesktop.org
Wed Aug 25 07:54:24 UTC 2010


Module: Mesa
Branch: master
Commit: 4e823197332604ca652ae6be21583725313f9f3d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4e823197332604ca652ae6be21583725313f9f3d

Author: Vinson Lee <vlee at vmware.com>
Date:   Wed Aug 25 00:52:34 2010 -0700

nvfx: Clean up header file inclusion in nvfx_screen.h.

Remove nvfx_context.h.
Include p_compiler.h for INLINE symbol.

Fixes nvfx_context.h -> nvfx_screen.h -> nvfx_context.h include recursion.

---

 src/gallium/drivers/nvfx/nvfx_screen.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nvfx/nvfx_screen.h b/src/gallium/drivers/nvfx/nvfx_screen.h
index 473a112..1b79235 100644
--- a/src/gallium/drivers/nvfx/nvfx_screen.h
+++ b/src/gallium/drivers/nvfx/nvfx_screen.h
@@ -1,11 +1,11 @@
 #ifndef __NVFX_SCREEN_H__
 #define __NVFX_SCREEN_H__
 
+#include "pipe/p_compiler.h"
 #include "util/u_double_list.h"
 #include "nouveau/nouveau_screen.h"
-#include "nvfx_context.h"
 
-struct nv04_2d_context;
+struct pipe_screen;
 
 struct nvfx_screen {
 	struct nouveau_screen base;




More information about the mesa-commit mailing list