xserver: Branch 'master'

[Alan Coopersmith]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aa5606be1c0ea72b38de48ca333c7da5436368ef
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri May 15 10:25:46 2015 -0700

    Make configure test for LD_NO_UNDEFINED_FLAG on Solaris work w/autoconf 2.69
    
    After upgrading from autoconf 2.68 to 2.69, this test started failing with
    "conftest.c", line 149: undefined symbol: NULL
    so use a raw 0 pointer to avoid header dependencies in the autoconf
    generated test case.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Mark Kettenis <kettenis at openbsd.org>

diff --git a/configure.ac b/configure.ac
index 0ab756d..bb56529 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1760,7 +1760,7 @@ case "$host_os" in
 #		 XORG_DRIVER_LIBS="-Wl,-z,defs -Wl,-z,parent=${bindir}/Xorg"
          ],[],
 		[AC_LANG_SOURCE([extern int main(int argc, char **argv);
-			int call_main(void) { return main(0, NULL); }])])
+			int call_main(void) { return main(0, (void *)0); }])])
 	     rm -f conftest.parent
 	    ])
 	;;