Fix for trac #3452 VLC fails to compile on OS X with zlib 1.2.4

This fix actually removes traces of the libc _LARGEFILE64_SOURCE
transitional API.

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

diff --git a/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt b/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt
index 43f923343946c770330084b4d1756380728085d5..337192bdb43dcd1d06d9186ff79bce42d891dbfb 100644 (file)
--- a/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt
+++ b/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt
@@ -18,7 +18,7 @@ include( config )
 add_definitions(-DHAVE_CONFIG_H)
 add_definitions(-D__LIBVLC__)
 # Large file support for Solaris and Linux:
-add_definitions(-D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE)
+add_definitions(-D_FILE_OFFSET_BITS=64 -D__USE_UNIX98)
 # Thread safety:
 add_definitions(-D_REENTRANT -D_THREAD_SAFE)
 

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index da5e336d2d8c97dc599439669ab1cbcf691407b1..652513600d73acdf0caad8a5f90d8522b3c911e3 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1178,7 +1178,7 @@ endif
 ifdef HAVE_WIN32
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) && make && make install)
 else
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install)
 endif
        $(INSTALL_NAME)
        touch $@

diff --git a/src/vlc-plugin.pc.in b/src/vlc-plugin.pc.in
index 0036f39365b0a6a8d8762aa2aec85719aac88e99..14da0a99c407042c428765d3c88a85a56f16f932 100644 (file)
--- a/src/vlc-plugin.pc.in
+++ b/src/vlc-plugin.pc.in
@@ -11,7 +11,6 @@ Cflags: -I${includedir} -I${pkgincludedir}/plugins \
        -D__PLUGIN__ \
        -D_FILE_OFFSET_BITS=64 \
        -D__USE_UNIX98 \
-       -D_LARGEFILE64_SOURCE \
        @DEFS_BIGENDIAN@ \
        -D_REENTRANT \
        -D_THREAD_SAFE

diff --git a/vlc-config.in.in b/vlc-config.in.in
index e7253236f7689a23dcc47dee79ad4f7d47700508..cebc26c3547c8f982f371235c9b0aff7c502e3d1 100644 (file)
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -82,7 +82,7 @@ linkage="c"
 #
 #  On Linux and Solaris, activate 64-bit off_t (by default under BSD)
 #
-cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE -D_REENTRANT -D_THREAD_SAFE"
+cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE"
 
 #
 #  Various additional defines