diff options
| author | Jakob Bornecrantz <[email protected]> | 2008-05-23 16:26:14 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <[email protected]> | 2008-05-23 16:26:14 +0200 |
| commit | a3dbd412df99c7d19b1f81b3b9ec7d5c8a09d069 (patch) | |
| tree | baa0e115e726948268a60d5865897ab4e177ff79 /src/gallium/include | |
| parent | e8d5be9c76b08ba423e3c635aae5178f2358169a (diff) | |
| parent | a22462f6ef769129ee56223f1edc2cb851505da8 (diff) | |
Merge branch 'gallium-i915-current' into gallium-0.1
Diffstat (limited to 'src/gallium/include')
| -rw-r--r-- | src/gallium/include/pipe/p_util.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gallium/include/pipe/p_util.h b/src/gallium/include/pipe/p_util.h index 0e7e2466662..a66ab765f72 100644 --- a/src/gallium/include/pipe/p_util.h +++ b/src/gallium/include/pipe/p_util.h @@ -204,7 +204,10 @@ mem_dup(const void *src, uint size) #define MIN2( A, B ) ( (A)<(B) ? (A) : (B) ) #define MAX2( A, B ) ( (A)>(B) ? (A) : (B) ) +/* JB stop warnings */ +#ifndef Elements #define Elements(x) (sizeof(x)/sizeof((x)[0])) +#endif #define Offset(TYPE, MEMBER) ((unsigned)&(((TYPE *)NULL)->MEMBER)) /** |