diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-02-13 01:11:25 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-02-13 01:11:25 +1000 |
| commit | 53116910b10e3b8a05f42970eff311c21808699f (patch) | |
| tree | 6831e50a56a02fed324f8cb119e05d837e00d7cf /include/GL/internal/glcore.h | |
| parent | 7e104f9cde94279a902b408e8d1cf21779b393a8 (diff) | |
| parent | 0ccbc3c905f0594a35d72887a1f115e148aaa596 (diff) | |
Merge remote branch 'origin/master' into radeon-rewrite
Conflicts:
configure.ac
src/mesa/drivers/dri/r200/r200_context.c
src/mesa/drivers/dri/r300/r300_render.c
Diffstat (limited to 'include/GL/internal/glcore.h')
| -rw-r--r-- | include/GL/internal/glcore.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/GL/internal/glcore.h b/include/GL/internal/glcore.h index 99de6c097f..547b111370 100644 --- a/include/GL/internal/glcore.h +++ b/include/GL/internal/glcore.h @@ -31,7 +31,9 @@ * Silicon Graphics, Inc. */ +#if !defined(_WIN32_WCE) #include <sys/types.h> +#endif #define GL_CORE_SGI 1 #define GL_CORE_MESA 2 |