Commit 52ce2e5f authored by Julien / Gellule's avatar Julien / Gellule Committed by Rémi Denis-Courmont

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: default avatarRémi Denis-Courmont <remi@remlab.net>
parent 164ed61c
...@@ -18,7 +18,7 @@ include( config ) ...@@ -18,7 +18,7 @@ include( config )
add_definitions(-DHAVE_CONFIG_H) add_definitions(-DHAVE_CONFIG_H)
add_definitions(-D__LIBVLC__) add_definitions(-D__LIBVLC__)
# Large file support for Solaris and Linux: # 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: # Thread safety:
add_definitions(-D_REENTRANT -D_THREAD_SAFE) add_definitions(-D_REENTRANT -D_THREAD_SAFE)
......
...@@ -1178,7 +1178,7 @@ endif ...@@ -1178,7 +1178,7 @@ endif
ifdef HAVE_WIN32 ifdef HAVE_WIN32
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) && make && make install) (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) && make && make install)
else 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 endif
$(INSTALL_NAME) $(INSTALL_NAME)
touch $@ touch $@
......
...@@ -11,7 +11,6 @@ Cflags: -I${includedir} -I${pkgincludedir}/plugins \ ...@@ -11,7 +11,6 @@ Cflags: -I${includedir} -I${pkgincludedir}/plugins \
-D__PLUGIN__ \ -D__PLUGIN__ \
-D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64 \
-D__USE_UNIX98 \ -D__USE_UNIX98 \
-D_LARGEFILE64_SOURCE \
@DEFS_BIGENDIAN@ \ @DEFS_BIGENDIAN@ \
-D_REENTRANT \ -D_REENTRANT \
-D_THREAD_SAFE -D_THREAD_SAFE
......
...@@ -82,7 +82,7 @@ linkage="c" ...@@ -82,7 +82,7 @@ linkage="c"
# #
# On Linux and Solaris, activate 64-bit off_t (by default under BSD) # 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 # Various additional defines
......
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