diff options
author | Mariano Pérez Rodríguez <mariano-perez-rodriguez@users.noreply.github.com> | 2015-02-07 14:02:33 -0300 |
---|---|---|
committer | Mariano Pérez Rodríguez <mariano-perez-rodriguez@users.noreply.github.com> | 2015-02-07 14:02:33 -0300 |
commit | c83a739bd8c9e6451414bcacade98733aeaa9834 (patch) | |
tree | f6ea1f883b9fe71d401dcfbc417d331cb26061e3 /src/config.h | |
parent | 414df143f51bab2f984c0fb67fccc637733bc570 (diff) | |
download | redis-c83a739bd8c9e6451414bcacade98733aeaa9834.tar.gz |
Fix for #2371
Fixing #2371 as per @mattsta's suggestion
Diffstat (limited to 'src/config.h')
-rw-r--r-- | src/config.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/config.h b/src/config.h index 1ed8ef301..c455ad9f0 100644 --- a/src/config.h +++ b/src/config.h @@ -34,6 +34,11 @@ #include <AvailabilityMacros.h> #endif +#ifdef __linux__ +#include <linux/version.h> +#include <features.h> +#endif + /* Define redis_fstat to fstat or fstat64() */ #if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6) #define redis_fstat fstat64 @@ -91,9 +96,6 @@ /* Define rdb_fsync_range to sync_file_range() on Linux, otherwise we use * the plain fsync() call. */ -#ifdef __linux__ -#include <linux/version.h> -#include <features.h> #if defined(__GLIBC__) && defined(__GLIBC_PREREQ) #if (LINUX_VERSION_CODE >= 0x020611 && __GLIBC_PREREQ(2, 6)) #define HAVE_SYNC_FILE_RANGE 1 @@ -103,7 +105,6 @@ #define HAVE_SYNC_FILE_RANGE 1 #endif #endif -#endif #ifdef HAVE_SYNC_FILE_RANGE #define rdb_fsync_range(fd,off,size) sync_file_range(fd,off,size,SYNC_FILE_RANGE_WAIT_BEFORE|SYNC_FILE_RANGE_WRITE) |