diff options
| author | Michel Dänzer <[email protected]> | 2008-05-21 17:15:07 +0100 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2008-05-21 17:15:07 +0100 |
| commit | 019fc3aa04f11d61e6d0f4791c171d1790577ab5 (patch) | |
| tree | 3a9cd284d00910388876b8d08d20bfc7f3faa841 /src | |
| parent | bf7519b0a40d18a1cc764357f18df59979604129 (diff) | |
| parent | e8d5be9c76b08ba423e3c635aae5178f2358169a (diff) | |
Merge branch 'gallium-0.1' into gallium-tex-surfaces
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/glapi/gl_x86_asm.py | 2 | ||||
| -rw-r--r-- | src/mesa/x86/glapi_x86.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/glapi/gl_x86_asm.py b/src/mesa/glapi/gl_x86_asm.py index 403e87261b0..651cb03f14d 100644 --- a/src/mesa/glapi/gl_x86_asm.py +++ b/src/mesa/glapi/gl_x86_asm.py @@ -51,7 +51,7 @@ class PrintGenericStubs(gl_XML.gl_print_base): def printRealHeader(self): print '#include "assyntax.h"' - print '#include "glapioffsets.h"' + print '#include "glapi/glapioffsets.h"' print '' print '#if defined(STDCALL_API)' print '# if defined(USE_MGL_NAMESPACE)' diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S index 9a5d875e214..b99c2b65203 100644 --- a/src/mesa/x86/glapi_x86.S +++ b/src/mesa/x86/glapi_x86.S @@ -27,7 +27,7 @@ */ #include "assyntax.h" -#include "glapioffsets.h" +#include "glapi/glapioffsets.h" #if defined(STDCALL_API) # if defined(USE_MGL_NAMESPACE) |