diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-11 08:04:06 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-11 08:04:06 +0100 |
| commit | c4583f59d8460f05ee211c2f8ed6208addfe3087 (patch) | |
| tree | 59420aaa7f249fcf3766adfab41e5285d48048e8 /mesalib/src/mesa | |
| parent | 71ff3367cab660035c6ea38e5171841dacd461b5 (diff) | |
| parent | 8753441b3ba4316448e1ae5f408e6a84b0116a3c (diff) | |
| download | vcxsrv-c4583f59d8460f05ee211c2f8ed6208addfe3087.tar.gz vcxsrv-c4583f59d8460f05ee211c2f8ed6208addfe3087.tar.bz2 vcxsrv-c4583f59d8460f05ee211c2f8ed6208addfe3087.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa git update 11 Feb 2013
Diffstat (limited to 'mesalib/src/mesa')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/utils.c | 3 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/hash_table.c | 3 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/macros.h | 3 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/set.c | 3 |
4 files changed, 6 insertions, 6 deletions
diff --git a/mesalib/src/mesa/drivers/dri/common/utils.c b/mesalib/src/mesa/drivers/dri/common/utils.c index 062712bf3..ac0773b0d 100644 --- a/mesalib/src/mesa/drivers/dri/common/utils.c +++ b/mesalib/src/mesa/drivers/dri/common/utils.c @@ -32,6 +32,7 @@ #include <string.h> #include <stdlib.h> #include <stdbool.h> +#include "main/macros.h" #include "main/mtypes.h" #include "main/cpuinfo.h" #include "main/extensions.h" @@ -391,8 +392,6 @@ static const struct { unsigned int attrib, offset; } attribMap[] = { __ATTRIB(__DRI_ATTRIB_SWAP_METHOD, level) }; -#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0])) - /** * Return the value of a configuration attribute. The attribute is diff --git a/mesalib/src/mesa/main/hash_table.c b/mesalib/src/mesa/main/hash_table.c index 2bd1929aa..af0510da1 100644 --- a/mesalib/src/mesa/main/hash_table.c +++ b/mesalib/src/mesa/main/hash_table.c @@ -44,10 +44,9 @@ #include <string.h> #include "main/hash_table.h" +#include "main/macros.h" #include "ralloc.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0])) - static const uint32_t deleted_key_value; /** diff --git a/mesalib/src/mesa/main/macros.h b/mesalib/src/mesa/main/macros.h index d1e81fe08..f6d38fb64 100644 --- a/mesalib/src/mesa/main/macros.h +++ b/mesalib/src/mesa/main/macros.h @@ -766,5 +766,8 @@ DIFFERENT_SIGNS(GLfloat x, GLfloat y) #define ENUM_TO_DOUBLE(E) ((GLdouble)(GLint)(E)) #define ENUM_TO_BOOLEAN(E) ((E) ? GL_TRUE : GL_FALSE) +/* Compute the size of an array */ +#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) + #endif diff --git a/mesalib/src/mesa/main/set.c b/mesalib/src/mesa/main/set.c index 736841fc9..2519b9694 100644 --- a/mesalib/src/mesa/main/set.c +++ b/mesalib/src/mesa/main/set.c @@ -34,11 +34,10 @@ #include <stdlib.h> +#include "macros.h" #include "set.h" #include "ralloc.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0])) - /* * From Knuth -- a good choice for hash/rehash values is p, p-2 where * p and p-2 are both prime. These tables are sized to have an extra 10% |