aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-05 05:34:07 -04:00
Code Activity

updated for version 7.3.923

Browse Source 
Problem:    Check for X11 header files fails on Solaris.
Solution:   Only use -Werror for gcc. (Laurent Blume)
This commit is contained in:
Bram Moolenaar
2013-05-04 04:40:15 +02:00
parent 8fadd8b840
commit d1864597a0
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/auto/configure vendored
View File

@@ -7656,7 +7656,11 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if X11 header files implicitly declare return values" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if X11 header files implicitly declare return values" >&5
$as_echo_n "checking if X11 header files implicitly declare return values... " >&6; } $as_echo_n "checking if X11 header files implicitly declare return values... " >&6; }
cflags_save=$CFLAGS cflags_save=$CFLAGS
CFLAGS="$CFLAGS $X_CFLAGS -Werror" if test "$GCC" = yes; then
CFLAGS="$CFLAGS $X_CFLAGS -Werror"
else
CFLAGS="$CFLAGS $X_CFLAGS"
fi
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include <X11/Xlib.h> #include <X11/Xlib.h>

7
src/configure.in
View File

@@ -1751,7 +1751,12 @@ else
dnl Check that the X11 header files don't use implicit declarations dnl Check that the X11 header files don't use implicit declarations
AC_MSG_CHECKING(if X11 header files implicitly declare return values) AC_MSG_CHECKING(if X11 header files implicitly declare return values)
cflags_save=$CFLAGS cflags_save=$CFLAGS
CFLAGS="$CFLAGS $X_CFLAGS -Werror" dnl -Werror is GCC only, others like Solaris Studio might not like it
if test "$GCC" = yes; then
CFLAGS="$CFLAGS $X_CFLAGS -Werror"
else
CFLAGS="$CFLAGS $X_CFLAGS"
fi
AC_TRY_COMPILE([#include <X11/Xlib.h>], , AC_TRY_COMPILE([#include <X11/Xlib.h>], ,
AC_MSG_RESULT(no), AC_MSG_RESULT(no),
CFLAGS="$CFLAGS -Wno-implicit-int" CFLAGS="$CFLAGS -Wno-implicit-int"

2
src/version.c
View File

@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
923,
/**/ /**/
922, 922,
/**/ /**/