summaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast/s_bitmap.c
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2008-07-23 21:06:01 +0900
committerJosé Fonseca <[email protected]>2008-07-24 21:24:10 +0900
commit101d1a658a614d1e2ec02b1e697f6161291af653 (patch)
tree1dab9e796d0917fd6b699465086b3b5629024a77 /src/mesa/swrast/s_bitmap.c
parentfd6865c7e5c3c38c273b8269ff30a1acec469b6f (diff)
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
Diffstat (limited to 'src/mesa/swrast/s_bitmap.c')
-rw-r--r--src/mesa/swrast/s_bitmap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_bitmap.c b/src/mesa/swrast/s_bitmap.c
index f3dda12e252..2308acae1cd 100644
--- a/src/mesa/swrast/s_bitmap.c
+++ b/src/mesa/swrast/s_bitmap.c
@@ -28,10 +28,10 @@
* \author Brian Paul
*/
-#include "glheader.h"
+#include "main/glheader.h"
#include "bufferobj.h"
#include "image.h"
-#include "macros.h"
+#include "main/macros.h"
#include "pixel.h"
#include "s_context.h"