diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-09 16:58:33 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-09 16:58:33 +0100 |
| commit | a8e5f06fe01732fbd643bc435dd3b8eaa602defe (patch) | |
| tree | b18cd9881bc5a6d317edca6c38fa912bade00802 /mesalib/src/gallium | |
| parent | 1ed503a856d9753a813951796bc6ba56c42ecd28 (diff) | |
| download | vcxsrv-a8e5f06fe01732fbd643bc435dd3b8eaa602defe.tar.gz vcxsrv-a8e5f06fe01732fbd643bc435dd3b8eaa602defe.tar.bz2 vcxsrv-a8e5f06fe01732fbd643bc435dd3b8eaa602defe.zip | |
libX11 mesa pixman git update 9 nov 2011
Diffstat (limited to 'mesalib/src/gallium')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_math.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_math.h b/mesalib/src/gallium/auxiliary/util/u_math.h index b9295f4f8..551463f75 100644 --- a/mesalib/src/gallium/auxiliary/util/u_math.h +++ b/mesalib/src/gallium/auxiliary/util/u_math.h @@ -207,6 +207,17 @@ double log2(double d) return log(d) * (1.0 / M_LN2); } +/* workaround a conflict with main/imports.h */ +#ifdef log2f +#undef log2f +#endif + +static INLINE +float log2f(float f) +{ + return logf(f) * (float) (1.0 / M_LN2); +} + #endif |