diff options
| author | José Fonseca <[email protected]> | 2008-07-23 21:06:01 +0900 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2008-07-24 21:24:10 +0900 |
| commit | 101d1a658a614d1e2ec02b1e697f6161291af653 (patch) | |
| tree | 1dab9e796d0917fd6b699465086b3b5629024a77 /src/mesa/swrast/s_texcombine.c | |
| parent | fd6865c7e5c3c38c273b8269ff30a1acec469b6f (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_texcombine.c')
| -rw-r--r-- | src/mesa/swrast/s_texcombine.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c index 4c5e22618ee..b7724f7b20a 100644 --- a/src/mesa/swrast/s_texcombine.c +++ b/src/mesa/swrast/s_texcombine.c @@ -23,11 +23,11 @@ */ -#include "glheader.h" -#include "context.h" -#include "colormac.h" -#include "imports.h" -#include "macros.h" +#include "main/glheader.h" +#include "main/context.h" +#include "main/colormac.h" +#include "main/imports.h" +#include "main/macros.h" #include "image.h" #include "s_context.h" |