diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-10-15 11:23:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-15 11:23:43 +0400 |
| commit | 2d50e5feaaaf9fa6e73aa2b1d62921265c77d041 (patch) | |
| tree | ab378a2404ad56a0f36bf155ba0abec7bf371501 /source/blender/blenlib | |
| parent | ab3290048c85e6dda28bd048d6815e2e9b52f6a2 (diff) | |
Fix T42226: Glibc <= 2.8 fails to build
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_sort.h | 3 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/sort.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_sort.h b/source/blender/blenlib/BLI_sort.h index 516f917a351..cb6b87bda38 100644 --- a/source/blender/blenlib/BLI_sort.h +++ b/source/blender/blenlib/BLI_sort.h @@ -35,7 +35,8 @@ #include <stdlib.h> -#ifdef __GLIBC__ +/* glibc 2.8+ */ +#if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 8)) # define BLI_qsort_r qsort_r #endif diff --git a/source/blender/blenlib/intern/sort.c b/source/blender/blenlib/intern/sort.c index 9fad7505f79..d7c314c95e3 100644 --- a/source/blender/blenlib/intern/sort.c +++ b/source/blender/blenlib/intern/sort.c @@ -32,7 +32,7 @@ #include <stdlib.h> -#ifndef __GLIBC__ +#if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 8)) #include "BLI_utildefines.h" |