From 101d1a658a614d1e2ec02b1e697f6161291af653 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Wed, 23 Jul 2008 21:06:01 +0900
Subject: mesa: Prefix main includes with dir to avoid conflicts.

Some of the headers in src/mesa/main have pretty common names which
easily conflict with third-party code, e.g. config.h
---
 src/mesa/swrast/s_blit.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/swrast/s_blit.c')

diff --git a/src/mesa/swrast/s_blit.c b/src/mesa/swrast/s_blit.c
index 5aec4aad035..0e12dfa1da6 100644
--- a/src/mesa/swrast/s_blit.c
+++ b/src/mesa/swrast/s_blit.c
@@ -23,8 +23,8 @@
  */
 
 
-#include "glheader.h"
-#include "macros.h"
+#include "main/glheader.h"
+#include "main/macros.h"
 #include "s_context.h"
 
 
-- 
cgit v1.2.3