[vlc-commits] fixups.h: added an explicit hack so binaries created on OS X Lion can be executed correctly on Snow Leopard

Felix Paul Kühne git at videolan.org
Fri Jan 27 01:17:45 CET 2012


vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Jan 10 00:50:13 2012 +0100| [509ff4ee3a295930d4f87a02e2cb836f9f2f969d] | committer: Jean-Baptiste Kempf

fixups.h: added an explicit hack so binaries created on OS X Lion can be executed correctly on Snow Leopard
(cherry picked from commit 679830ea6062dcfb7184c084f5787a8b6f436a3c)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=509ff4ee3a295930d4f87a02e2cb836f9f2f969d
---

 include/vlc_fixups.h |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 15ebb4c..d127aae 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -88,7 +88,11 @@ int putc_unlocked (int, FILE *);
 int putchar_unlocked (int);
 #endif
 
-#ifndef HAVE_GETDELIM
+/* 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 || defined(__APPLE__)
 ssize_t getdelim (char **, size_t *, int, FILE *);
 ssize_t getline (char **, size_t *, FILE *);
 #endif



More information about the vlc-commits mailing list