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/drivers | |
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/drivers')
-rw-r--r-- | mesalib/src/mesa/drivers/dri/common/utils.c | 3 |
1 files changed, 1 insertions, 2 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 |