averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-07 15:37:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Only pull in AvailabilityMacros.h when necessary

Browse Source
This commit is contained in:
Felix Bünemann
2013-10-26 20:56:20 +02:00
committed by Bjorn Winckler
parent 8041d3a33e
commit fc64ef523f
4 changed files with 5311 additions and 12234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/auto/configure
Vendored
+5297 -12230
View File
File diff suppressed because it is too large Load Diff
src/config.h.in
+3
View File
@@ -442,3 +442,6 @@
/* Define if you want Cygwin to use the WIN32 clipboard, not compatible with X11*/
#undef FEAT_CYGWIN_WIN32_CLIPBOARD
/* Define if we have AvailabilityMacros.h on Mac OS X */
#undef HAVE_AVAILABILITYMACROS_H
src/configure.in
+7
View File
@@ -219,6 +219,13 @@ 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.
dnl If Carbon or Cocoa is found, assume we don't want
dnl X11 unless it was specifically asked for (--with-x)
dnl or Motif, Athena or GTK GUI is used.
src/os_mac.h
+4 -4
View File
@@ -16,10 +16,10 @@
# define OPAQUE_TOOLBOX_STRUCTS 0
#endif
/* Include MAC_OS_X_VERSION_* macros (needed for OS X 10.9, should be supported
* as of OS X 10.2)
* */
#include <AvailabilityMacros.h>
/* Include MAC_OS_X_VERSION_* macros */
#ifdef HAVE_AVAILABILITYMACROS_H
# include <AvailabilityMacros.h>
#endif
/*
* Macintosh machine-dependent things.