vlc | branch: master | Felix Paul Kühne <[email protected]> | Tue Jan 10 11:48:41 2012 +0100| [084beb155c04a4e56b98c366bc6a1bd3d156ff17] | committer: Felix Paul Kühne
compat: always compile getdelim on Darwin same rationale as in 679830ea6062dcfb7184c084f5787a8b6f436a3c > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=084beb155c04a4e56b98c366bc6a1bd3d156ff17 --- configure.ac | 3 +++ include/vlc_fixups.h | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index fec1f3c..e35158e 100644 --- a/configure.ac +++ b/configure.ac @@ -152,6 +152,9 @@ case "${host_os}" in VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings]) VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation]) + dnl Allow binaries created on Lion to run on earlier releases + AC_LIBOBJ([getdelim]) + dnl dnl Check for Mac OS X SDK settings dnl diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h index 5f8f397..48ccf24 100644 --- a/include/vlc_fixups.h +++ b/include/vlc_fixups.h @@ -44,7 +44,8 @@ typedef struct #endif #if !defined (HAVE_REWIND) || \ - !defined (HAVE_GETDELIM) + !defined (HAVE_GETDELIM) || \ + defined (__APPLE__) # include <stdio.h> /* FILE */ #endif @@ -58,7 +59,7 @@ typedef struct # include <stdarg.h> /* va_list */ #endif -#if !defined (HAVE_GETDELIM) || \ +#if !defined (HAVE_GETDELIM) || defined (__APPLE__) || \ !defined (HAVE_GETPID) || \ !defined (HAVE_SWAB) # include <sys/types.h> /* ssize_t, pid_t */ @@ -92,7 +93,7 @@ int putchar_unlocked (int); * 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 || defined(__APPLE__) +#if !defined HAVE_GETDELIM ssize_t getdelim (char **, size_t *, int, FILE *); ssize_t getline (char **, size_t *, FILE *); #endif _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
