diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-01-16 13:14:19 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-01-16 13:14:19 +1100 |
| commit | 3119e9a14b66fcfb08fcc3563602273dd2e1893c (patch) | |
| tree | 74ff685faec3430b66d70522b6ed717f57e54f00 /src/mesa/pipe/p_util.h | |
| parent | 9de335f5807553bc9251931ba3e80c4b454b5818 (diff) | |
| parent | 587e2becc237bc1c900a1c0ba114a1a0192690ff (diff) | |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Conflicts:
src/mesa/pipe/Makefile
Diffstat (limited to 'src/mesa/pipe/p_util.h')
| -rw-r--r-- | src/mesa/pipe/p_util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/pipe/p_util.h b/src/mesa/pipe/p_util.h index 46edcf3075..69ec62e307 100644 --- a/src/mesa/pipe/p_util.h +++ b/src/mesa/pipe/p_util.h @@ -30,7 +30,6 @@ #include "p_compiler.h" #include <math.h> -#include <stdint.h> #ifdef WIN32 @@ -124,6 +123,7 @@ align_malloc(size_t bytes, uint alignment) (void) posix_memalign(& mem, alignment, bytes); return mem; #else + typedef unsigned long int uintptr_t; uintptr_t ptr, buf; assert( alignment > 0 ); |