Commit 4ee436f7 authored by Felix Paul Kühne's avatar Felix Paul Kühne Committed by Jean-Baptiste Kempf

compat: always compile getdelim on Darwin

same rationale as in 679830ea6062dcfb7184c084f5787a8b6f436a3c
(cherry picked from commit 084beb155c04a4e56b98c366bc6a1bd3d156ff17)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 8ab6e44a
...@@ -161,6 +161,9 @@ case "${host_os}" in ...@@ -161,6 +161,9 @@ case "${host_os}" in
VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings]) VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings])
VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation]) VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation])
dnl Allow binaries created on Lion to run on earlier releases
AC_LIBOBJ([getdelim])
dnl dnl
dnl Check for Mac OS X SDK settings dnl Check for Mac OS X SDK settings
dnl dnl
......
...@@ -44,7 +44,8 @@ typedef struct ...@@ -44,7 +44,8 @@ typedef struct
#endif #endif
#if !defined (HAVE_REWIND) || \ #if !defined (HAVE_REWIND) || \
!defined (HAVE_GETDELIM) !defined (HAVE_GETDELIM) || \
defined (__APPLE__)
# include <stdio.h> /* FILE */ # include <stdio.h> /* FILE */
#endif #endif
...@@ -58,7 +59,7 @@ typedef struct ...@@ -58,7 +59,7 @@ typedef struct
# include <stdarg.h> /* va_list */ # include <stdarg.h> /* va_list */
#endif #endif
#if !defined (HAVE_GETDELIM) || \ #if !defined (HAVE_GETDELIM) || defined (__APPLE__) || \
!defined (HAVE_GETPID) || \ !defined (HAVE_GETPID) || \
!defined (HAVE_SWAB) !defined (HAVE_SWAB)
# include <sys/types.h> /* ssize_t, pid_t */ # include <sys/types.h> /* ssize_t, pid_t */
...@@ -92,7 +93,7 @@ int putchar_unlocked (int); ...@@ -92,7 +93,7 @@ int putchar_unlocked (int);
* was added lately to Darwin 11 (OS X Lion) only. * was added lately to Darwin 11 (OS X Lion) only.
* However, we want binaries created on this OS to be executable on previous * However, we want binaries created on this OS to be executable on previous
* releases. */ * releases. */
#if !defined HAVE_GETDELIM || defined(__APPLE__) #if !defined HAVE_GETDELIM
ssize_t getdelim (char **, size_t *, int, FILE *); ssize_t getdelim (char **, size_t *, int, FILE *);
ssize_t getline (char **, size_t *, FILE *); ssize_t getline (char **, size_t *, FILE *);
#endif #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