thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.4.061

Browse Source 
Problem:    Availability macros configure check in wrong place.
Solution:   Also check when not using Darwin. Remove version check.
This commit is contained in:
Bram Moolenaar
2013-11-03 00:41:00 +01:00
parent 0b400087d0
commit 39766a7595
4 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/auto/configure vendored
View File

@@ -4223,7 +4223,7 @@ rm -f core conftest.err conftest.$ac_objext \
OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp"
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
do :
@@ -4241,16 +4241,7 @@ fi
done
ac_fn_c_check_header_mongrel "$LINENO" "AvailabilityMacros.h" "ac_cv_header_AvailabilityMacros_h" "$ac_includes_default"
if test "x$ac_cv_header_AvailabilityMacros_h" = x""yes; then :
$as_echo "#define HAVE_AVAILABILITYMACROS_H 1" >>confdefs.h
fi
ac_fn_c_check_header_mongrel "$LINENO" "Carbon/Carbon.h" "ac_cv_header_Carbon_Carbon_h" "$ac_includes_default"
ac_fn_c_check_header_mongrel "$LINENO" "Carbon/Carbon.h" "ac_cv_header_Carbon_Carbon_h" "$ac_includes_default"
if test "x$ac_cv_header_Carbon_Carbon_h" = x""yes; then :
CARBON=yes
fi
@@ -4272,6 +4263,13 @@ else
$as_echo "no" >&6; }
fi
ac_fn_c_check_header_mongrel "$LINENO" "AvailabilityMacros.h" "ac_cv_header_AvailabilityMacros_h" "$ac_includes_default"
if test "x$ac_cv_header_AvailabilityMacros_h" = x""yes; then :
HAVE_AVAILABILITYMACROS_H=1
fi

8
src/configure.in
View File

@@ -206,10 +206,6 @@ if test "`(uname) 2>/dev/null`" = Darwin; then
dnl TODO: use -arch i386 on Intel machines
CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp"
dnl Mac OS X 10.9+ no longer include AvailabilityMacros.h in Carbon
dnl so we need to include it to have access to version macros.
AC_CHECK_HEADER(AvailabilityMacros.h, [AC_DEFINE(HAVE_AVAILABILITYMACROS_H, 1, [ Define if we have AvailabilityMacros.h on Mac OS X ])])
dnl If Carbon is found, assume we don't want X11
dnl unless it was specifically asked for (--with-x)
dnl or Motif, Athena or GTK GUI is used.
@@ -232,6 +228,10 @@ else
AC_MSG_RESULT(no)
fi
dnl Mac OS X 10.9+ no longer include AvailabilityMacros.h in Carbon
dnl so we need to include it to have access to version macros.
AC_CHECK_HEADER(AvailabilityMacros.h, HAVE_AVAILABILITYMACROS_H=1)
AC_SUBST(OS_EXTRA_SRC)
AC_SUBST(OS_EXTRA_OBJ)

4
src/os_unix.c
View File

@@ -804,9 +804,7 @@ mch_stackcheck(p)
* completely full.
*/
#if defined(HAVE_AVAILABILITYMACROS_H) \
&& defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) \
&& (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1090)
#if defined(HAVE_AVAILABILITYMACROS_H)
# include <AvailabilityMacros.h>
#endif

2
src/version.c
View File

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