diff options
author | Yann Collet <Cyan4973@users.noreply.github.com> | 2017-02-10 18:25:04 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-10 18:25:04 (GMT) |
commit | 7e57c398c1b23f1631f690e0154ee4bee98e5f71 (patch) | |
tree | 72c5827005a60ab4b42706c9adfbee85ecbaafc6 | |
parent | f4b9c1d034597b22f58a4572098bc147d715898b (diff) | |
parent | c139eb40b0d78db390bdc37188eb696d9272f9c4 (diff) | |
download | lz4-7e57c398c1b23f1631f690e0154ee4bee98e5f71.zip lz4-7e57c398c1b23f1631f690e0154ee4bee98e5f71.tar.gz lz4-7e57c398c1b23f1631f690e0154ee4bee98e5f71.tar.bz2 |
Merge pull request #316 from inikep/dev
Dev
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | programs/Makefile | 3 | ||||
-rw-r--r-- | programs/platform.h | 6 | ||||
-rw-r--r-- | tests/Makefile | 6 |
4 files changed, 12 insertions, 11 deletions
@@ -86,10 +86,10 @@ clean: @echo Cleaning completed -#------------------------------------------------------------------------ -#make install is validated only for Linux, OSX, kFreeBSD, Hurd and -#FreeBSD targets -ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly)) +#----------------------------------------------------------------------------- +# make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets +#----------------------------------------------------------------------------- +ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS)) HOST_OS = POSIX install: diff --git a/programs/Makefile b/programs/Makefile index 8a271c2..4a8103c 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -44,6 +44,7 @@ LZ4DIR := ../lib SRCFILES := $(wildcard $(LZ4DIR)/*.c) $(wildcard *.c) OBJFILES := $(patsubst %.c,%.o,$(SRCFILES)) +VOID := /dev/null CPPFLAGS+= -I$(LZ4DIR) -DXXH_NAMESPACE=LZ4_ CFLAGS ?= -O3 @@ -60,10 +61,8 @@ MD2ROFF_FLAGS = --roff --warnings --manual="User Commands" --organization="lz4 # Define *.exe as extension for Windows systems ifneq (,$(filter Windows%,$(OS))) -VOID := nul EXT :=.exe else -VOID := /dev/null EXT := endif diff --git a/programs/platform.h b/programs/platform.h index f1040c0..f9eb81a 100644 --- a/programs/platform.h +++ b/programs/platform.h @@ -59,7 +59,7 @@ extern "C" { /* ********************************************************* * Turn on Large Files support (>4GB) for 32-bit Linux/Unix ***********************************************************/ -#if !defined(__64BIT__) /* No point defining Large file for 64 bit */ +#if !defined(__64BIT__) || defined(__MINGW32__) /* No point defining Large file for 64 bit but MinGW requires it */ # if !defined(_FILE_OFFSET_BITS) # define _FILE_OFFSET_BITS 64 /* turn off_t into a 64-bit type for ftello, fseeko */ # endif @@ -85,7 +85,9 @@ extern "C" { # define PLATFORM_POSIX_VERSION 200112L # else # if defined(__linux__) || defined(__linux) -# define _POSIX_C_SOURCE 200112L /* use feature test macro */ +# ifndef _POSIX_C_SOURCE +# define _POSIX_C_SOURCE 200112L /* use feature test macro */ +# endif # endif # include <unistd.h> /* declares _POSIX_VERSION */ # if defined(_POSIX_VERSION) /* POSIX compliant */ diff --git a/tests/Makefile b/tests/Makefile index 5f8efb7..77e6ae7 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -121,9 +121,9 @@ versionsTest: $(PYTHON) test-lz4-versions.py -#------------------------------------------------------------------------ -#make test is validated only for Linux, OSX, kFreeBSD, FreeBSD, Hurd and -#Solaris targets +#----------------------------------------------------------------------------- +# make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets +#----------------------------------------------------------------------------- ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS)) MD5:=md5sum |