diff options
author | marha <marha@users.sourceforge.net> | 2012-10-26 08:13:08 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-10-26 08:13:08 +0200 |
commit | af2d8fb974d476eadcd3cde3baebd038f5750600 (patch) | |
tree | 9e24173d3f3dacb518a614984d26eaf7e87c7598 /mesalib/src/glsl/ralloc.c | |
parent | f6c8097ba5b5bb714185762dbd0ff9958d23e804 (diff) | |
parent | 8d86f8c566c4181c846a872a5a2f88718e635a72 (diff) | |
download | vcxsrv-af2d8fb974d476eadcd3cde3baebd038f5750600.tar.gz vcxsrv-af2d8fb974d476eadcd3cde3baebd038f5750600.tar.bz2 vcxsrv-af2d8fb974d476eadcd3cde3baebd038f5750600.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig pixman mesa git update 26 oct 2012
Diffstat (limited to 'mesalib/src/glsl/ralloc.c')
-rw-r--r-- | mesalib/src/glsl/ralloc.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/mesalib/src/glsl/ralloc.c b/mesalib/src/glsl/ralloc.c index 3da09b559..59e71c48b 100644 --- a/mesalib/src/glsl/ralloc.c +++ b/mesalib/src/glsl/ralloc.c @@ -41,14 +41,6 @@ _CRTIMP int _vscprintf(const char *format, va_list argptr); #include "ralloc.h" -#ifdef __GNUC__ -#define likely(x) __builtin_expect(!!(x),1) -#define unlikely(x) __builtin_expect(!!(x),0) -#else -#define likely(x) !!(x) -#define unlikely(x) !!(x) -#endif - #ifndef va_copy #ifdef __va_copy #define va_copy(dest, src) __va_copy((dest), (src)) |