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/glapi | |
| 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/glapi')
| -rw-r--r-- | src/mesa/glapi/glapi.c | 2 | ||||
| -rw-r--r-- | src/mesa/glapi/glapi_getproc.c | 2 | ||||
| -rw-r--r-- | src/mesa/glapi/glthread.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c index c236656d9a6..53efd7eef47 100644 --- a/src/mesa/glapi/glapi.c +++ b/src/mesa/glapi/glapi.c @@ -50,7 +50,7 @@ -#include "glheader.h" +#include "main/glheader.h" #include "glapi.h" #include "glapioffsets.h" #include "glapitable.h" diff --git a/src/mesa/glapi/glapi_getproc.c b/src/mesa/glapi/glapi_getproc.c index 3634444c855..6d40b495c7e 100644 --- a/src/mesa/glapi/glapi_getproc.c +++ b/src/mesa/glapi/glapi_getproc.c @@ -32,7 +32,7 @@ #include <stdlib.h> #include <string.h> -#include "glheader.h" +#include "main/glheader.h" #include "glapi.h" #include "glapioffsets.h" #include "glapitable.h" diff --git a/src/mesa/glapi/glthread.c b/src/mesa/glapi/glthread.c index 4513853f5a2..09cc8cfcde2 100644 --- a/src/mesa/glapi/glthread.c +++ b/src/mesa/glapi/glthread.c @@ -29,7 +29,7 @@ */ -#include "glheader.h" +#include "main/glheader.h" #include "glthread.h" |