xf86-video-intel: configure.ac src/sna/sna_display.c

Chris Wilson ickle at kemper.freedesktop.org
Wed Mar 25 06:18:42 PDT 2015


 configure.ac          |    2 +-
 src/sna/sna_display.c |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit d85e68e2d310a5646e4e71a06edf2b21b1d18688
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Mar 25 13:16:56 2015 +0000

    sna: Add include <alloca.h> for compiling on Solaris
    
    Reported-by: Richard Palo <richard at netbsd.org>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89762
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/configure.ac b/configure.ac
index 9aadc73..1bb64fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -416,7 +416,7 @@ AC_ARG_ENABLE(sna,
 	      [SNA="$enableval"],
 	      [SNA=auto])
 
-AC_CHECK_HEADERS([dev/wscons/wsconsio.h])
+AC_CHECK_HEADERS([dev/wscons/wsconsio.h alloca.h])
 
 if test "x$SNA" != "xno"; then
 	AC_DEFINE(USE_SNA, 1, [Enable SNA support])
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 3ea3436..cee4a72 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -40,6 +40,10 @@
 #include <poll.h>
 #include <ctype.h>
 
+#if HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+
 #include "sna.h"
 #include "sna_reg.h"
 #include "fb/fbpict.h"


More information about the xorg-commit mailing list