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/vf | |
| 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/vf')
| -rw-r--r-- | src/mesa/vf/vf.c | 6 | ||||
| -rw-r--r-- | src/mesa/vf/vf_generic.c | 8 | ||||
| -rw-r--r-- | src/mesa/vf/vf_sse.c | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/mesa/vf/vf.c b/src/mesa/vf/vf.c index cb25f2e1131..82f3d2b641d 100644 --- a/src/mesa/vf/vf.c +++ b/src/mesa/vf/vf.c @@ -25,9 +25,9 @@ * Keith Whitwell <[email protected]> */ -#include "glheader.h" -#include "context.h" -#include "colormac.h" +#include "main/glheader.h" +#include "main/context.h" +#include "main/colormac.h" #include "vf.h" diff --git a/src/mesa/vf/vf_generic.c b/src/mesa/vf/vf_generic.c index 68d8d0897b8..baa00af29a6 100644 --- a/src/mesa/vf/vf_generic.c +++ b/src/mesa/vf/vf_generic.c @@ -26,10 +26,10 @@ * Keith Whitwell <[email protected]> */ -#include "glheader.h" -#include "context.h" -#include "colormac.h" -#include "simple_list.h" +#include "main/glheader.h" +#include "main/context.h" +#include "main/colormac.h" +#include "main/simple_list.h" #include "vf/vf.h" diff --git a/src/mesa/vf/vf_sse.c b/src/mesa/vf/vf_sse.c index c3a2166578c..4d70196ffed 100644 --- a/src/mesa/vf/vf_sse.c +++ b/src/mesa/vf/vf_sse.c @@ -25,10 +25,10 @@ * Keith Whitwell <[email protected]> */ -#include "glheader.h" -#include "colormac.h" -#include "simple_list.h" -#include "enums.h" +#include "main/glheader.h" +#include "main/colormac.h" +#include "main/simple_list.h" +#include "main/enums.h" #include "vf/vf.h" |