Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
50a57c67
Commit
50a57c67
authored
Feb 10, 2015
by
Salvatore Sanfilippo
Browse files
Merge pull request #2372 from mariano-perez-rodriguez/patch-2
Fix HAVE_BACKTRACE on Linux
parents
bd128f79
c83a739b
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/config.h
View file @
50a57c67
...
@@ -34,6 +34,11 @@
...
@@ -34,6 +34,11 @@
#include <AvailabilityMacros.h>
#include <AvailabilityMacros.h>
#endif
#endif
#ifdef __linux__
#include <linux/version.h>
#include <features.h>
#endif
/* Define redis_fstat to fstat or fstat64() */
/* Define redis_fstat to fstat or fstat64() */
#if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
#if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
#define redis_fstat fstat64
#define redis_fstat fstat64
...
@@ -91,9 +96,6 @@
...
@@ -91,9 +96,6 @@
/* Define rdb_fsync_range to sync_file_range() on Linux, otherwise we use
/* Define rdb_fsync_range to sync_file_range() on Linux, otherwise we use
* the plain fsync() call. */
* the plain fsync() call. */
#ifdef __linux__
#include <linux/version.h>
#include <features.h>
#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
#if (LINUX_VERSION_CODE >= 0x020611 && __GLIBC_PREREQ(2, 6))
#if (LINUX_VERSION_CODE >= 0x020611 && __GLIBC_PREREQ(2, 6))
#define HAVE_SYNC_FILE_RANGE 1
#define HAVE_SYNC_FILE_RANGE 1
...
@@ -103,7 +105,6 @@
...
@@ -103,7 +105,6 @@
#define HAVE_SYNC_FILE_RANGE 1
#define HAVE_SYNC_FILE_RANGE 1
#endif
#endif
#endif
#endif
#endif
#ifdef HAVE_SYNC_FILE_RANGE
#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)
#define rdb_fsync_range(fd,off,size) sync_file_range(fd,off,size,SYNC_FILE_RANGE_WAIT_BEFORE|SYNC_FILE_RANGE_WRITE)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment