Mesa (master): Fix compilation on cygwin after commit 762c9766c93697af8d7fbaa729aed118789dbe8e

Jon TURNEY jturney at kemper.freedesktop.org
Tue Dec 20 13:46:56 UTC 2011


Module: Mesa
Branch: master
Commit: 9f8573b7aeed3ef88d680dbf2856f19503ac5cd6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9f8573b7aeed3ef88d680dbf2856f19503ac5cd6

Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Mon Dec 19 17:42:02 2011 +0000

Fix compilation on cygwin after commit 762c9766c93697af8d7fbaa729aed118789dbe8e

Fix compilation on cygwin after commit 762c9766c93697af8d7fbaa729aed118789dbe8e
"Use VERT_ATTRIB_* indexed array in gl_array_object" added the first non-driver
use of ffsll(), which exposes the fact that this isn't provided on cygwin.

Found by tinderbox, see [1]

[1] http://tinderbox.freedesktop.org/builds/2011-11-30-0017/logs/libGL/#build

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/main/imports.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 797f357..d5e3859 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -568,7 +568,7 @@ _mesa_init_sqrt_table(void);
 
 #ifdef __GNUC__
 
-#if defined(__MINGW32__) || defined(ANDROID)
+#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(ANDROID)
 #define ffs __builtin_ffs
 #define ffsll __builtin_ffsll
 #endif




More information about the mesa-commit mailing list