Commit 49972383 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: fixed execution of binaries linked against the 10.7 SDK on 10.6

parent 4a646775
......@@ -154,7 +154,13 @@ case "${host_os}" in
VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation])
dnl Allow binaries created on Lion to run on earlier releases
AC_LIBOBJ([getdelim])
AC_EGREP_CPP(yes,
[#import <Cocoa/Cocoa.h>
#ifdef MAC_OS_X_VERSION_10_7
yes
#endif],
[AC_MSG_RESULT([yes])
AC_LIBOBJ([getdelim strndup strnlen])],)
dnl
dnl Check for Mac OS X SDK settings
......
......@@ -44,8 +44,7 @@ typedef struct
#endif
#if !defined (HAVE_REWIND) || \
!defined (HAVE_GETDELIM) || \
defined (__APPLE__)
!defined (HAVE_GETDELIM)
# include <stdio.h> /* FILE */
#endif
......@@ -59,7 +58,7 @@ typedef struct
# include <stdarg.h> /* va_list */
#endif
#if !defined (HAVE_GETDELIM) || defined (__APPLE__) || \
#if !defined (HAVE_GETDELIM) || \
!defined (HAVE_GETPID) || \
!defined (HAVE_SWAB)
# include <sys/types.h> /* ssize_t, pid_t */
......@@ -89,11 +88,7 @@ int putc_unlocked (int, FILE *);
int putchar_unlocked (int);
#endif
/* we always need our implementation on Darwin, since native support for getline
* was added lately to Darwin 11 (OS X Lion) only.
* However, we want binaries created on this OS to be executable on previous
* releases. */
#if !defined HAVE_GETDELIM
#ifndef HAVE_GETDELIM
ssize_t getdelim (char **, size_t *, int, FILE *);
ssize_t getline (char **, size_t *, FILE *);
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment