diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-23 22:41:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-23 22:41:48 +0200 |
| commit | d26ea2f474c48afa7d3c261572da5d85b7b62bd8 (patch) | |
| tree | f4b1f3cac1b011283ae536868c3aee42bc14ff07 /mesalib/src/mesa/drivers/dri/common | |
| parent | dda1497a1e88c6cb8b8d91a7bc61283b697e8ea0 (diff) | |
| download | vcxsrv-d26ea2f474c48afa7d3c261572da5d85b7b62bd8.tar.gz vcxsrv-d26ea2f474c48afa7d3c261572da5d85b7b62bd8.tar.bz2 vcxsrv-d26ea2f474c48afa7d3c261572da5d85b7b62bd8.zip | |
fontconfig mesa xserver xkeyboard-config pixman git update 23 Apr 2014
xserver commit 99f0365b1fbdfd9238b9f5cc28491e4e6c7324f1
xkeyboard-config commit b5eb5418e5a9d76b172faadf6901bc9c83f2ddad
pixman commit 5f661ee719be25c3aa0eb0d45e0db23a37e76468
fontconfig commit 81664fe54f117e4781fda5a30429b51858302e91
mesa commit fd92346c53ed32709c7b56ce58fb9c9bf43ce9a8
Diffstat (limited to 'mesalib/src/mesa/drivers/dri/common')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/utils.c | 7 | ||||
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/utils.h | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/mesalib/src/mesa/drivers/dri/common/utils.c b/mesalib/src/mesa/drivers/dri/common/utils.c index 1f29e0b08..eee77ec69 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 <stdint.h> #include "main/macros.h" #include "main/mtypes.h" #include "main/cpuinfo.h" @@ -40,14 +41,12 @@ #include "dri_util.h" -unsigned +uint64_t driParseDebugString( const char * debug, const struct dri_debug_control * control ) { - unsigned flag; - + uint64_t flag = 0; - flag = 0; if ( debug != NULL ) { while( control->string != NULL ) { if ( !strcmp( debug, "all" ) || diff --git a/mesalib/src/mesa/drivers/dri/common/utils.h b/mesalib/src/mesa/drivers/dri/common/utils.h index 094143446..3760c38fc 100644 --- a/mesalib/src/mesa/drivers/dri/common/utils.h +++ b/mesalib/src/mesa/drivers/dri/common/utils.h @@ -34,10 +34,10 @@ struct dri_debug_control { const char * string; - unsigned flag; + uint64_t flag; }; -extern unsigned driParseDebugString( const char * debug, +extern uint64_t driParseDebugString( const char * debug, const struct dri_debug_control * control ); extern unsigned driGetRendererString( char * buffer, |