diff options
Diffstat (limited to 'package/redis')
| -rw-r--r-- | package/redis/redis-001-uclibc.patch | 2 | ||||
| -rw-r--r-- | package/redis/redis-003-largefile-conditional-define.patch | 32 |
2 files changed, 33 insertions, 1 deletions
diff --git a/package/redis/redis-001-uclibc.patch b/package/redis/redis-001-uclibc.patch index d7fd9c3c5..8762ca2fb 100644 --- a/package/redis/redis-001-uclibc.patch +++ b/package/redis/redis-001-uclibc.patch @@ -15,7 +15,7 @@ diff -ur old/src/config.h new/src/config.h #ifndef __CONFIG_H #define __CONFIG_H -+#ifdef __unix ++#if defined(__unix) || defined(__linux__) +#include <features.h> +#endif + diff --git a/package/redis/redis-003-largefile-conditional-define.patch b/package/redis/redis-003-largefile-conditional-define.patch new file mode 100644 index 000000000..747e0552b --- /dev/null +++ b/package/redis/redis-003-largefile-conditional-define.patch @@ -0,0 +1,32 @@ +Define _LARGEFILE_SOURCE and _FILE_OFFSET_BITS conditionally + +In order to avoid ugly warnings at compile time, only define +_LARGEFILE_SOURCE and _FILE_OFFSET_BITS if they have not already been +defined through the build command line. + +Avoids: + + In file included from redis.h:33:0, + from migrate.c:1: + fmacros.h:45:0: warning: "_LARGEFILE_SOURCE" redefined + <command-line>:0:0: note: this is the location of the previous definition + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: redis-2.6.11/src/fmacros.h +=================================================================== +--- redis-2.6.11.orig/src/fmacros.h 2013-03-25 22:09:15.000000000 +0100 ++++ redis-2.6.11/src/fmacros.h 2013-03-25 22:09:40.000000000 +0100 +@@ -42,7 +42,12 @@ + #define _XOPEN_SOURCE + #endif + ++#ifndef _LARGEFILE_SOURCE + #define _LARGEFILE_SOURCE ++#endif ++ ++#ifndef _FILE_OFFSET_BITS + #define _FILE_OFFSET_BITS 64 ++#endif + + #endif |