Mesa (master): nvfx: Fix include recursion.

Vinson Lee vlee at kemper.freedesktop.org
Mon Apr 19 06:55:48 UTC 2010


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

Author: Vinson Lee <vlee at vmware.com>
Date:   Sun Apr 18 23:44:24 2010 -0700

nvfx: Fix include recursion.

Don't include nvfx_context.h and use a forward reference instead.
nvfx_context.h includes nvfx_screen.h (itself).

---

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

diff --git a/src/gallium/drivers/nvfx/nvfx_screen.h b/src/gallium/drivers/nvfx/nvfx_screen.h
index 127d891..5e1c394 100644
--- a/src/gallium/drivers/nvfx/nvfx_screen.h
+++ b/src/gallium/drivers/nvfx/nvfx_screen.h
@@ -4,7 +4,8 @@
 #include "util/u_double_list.h"
 #include "nouveau/nouveau_screen.h"
 #include "nv04_surface_2d.h"
-#include "nvfx_context.h"
+
+struct nvfx_context;
 
 struct nvfx_screen {
 	struct nouveau_screen base;




More information about the mesa-commit mailing list