Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From 23a3759b74d081b3b2849b0d37a0e5219f37813e Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 7 Jan 2016 22:37:48 +0000 |
| 4 | Subject: [PATCH] canonicalize_file_name is specific to glibc |
| 5 | |
| 6 | When on Linux and not using glibc then we need to define |
| 7 | canonicalize_file_name() API, therefore add a check for finding out if |
| 8 | its not glibc |
| 9 | |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | Upstream-Status: Pending |
| 13 | |
| 14 | agent/tcf/framework/mdep.c | 2 +- |
| 15 | agent/tcf/framework/mdep.h | 2 +- |
| 16 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 17 | |
| 18 | diff --git a/agent/tcf/framework/mdep.c b/agent/tcf/framework/mdep.c |
| 19 | index 2b52ca8..7d09655 100644 |
| 20 | --- a/agent/tcf/framework/mdep.c |
| 21 | +++ b/agent/tcf/framework/mdep.c |
| 22 | @@ -1042,7 +1042,7 @@ char * canonicalize_file_name(const char * path) { |
| 23 | return strdup(res); |
| 24 | } |
| 25 | |
| 26 | -#elif defined(__UCLIBC__) |
| 27 | +#elif defined(__UCLIBC__) || !defined(__GLIBC__) |
| 28 | |
| 29 | char * canonicalize_file_name(const char * path) { |
| 30 | return realpath(path, NULL); |
| 31 | diff --git a/agent/tcf/framework/mdep.h b/agent/tcf/framework/mdep.h |
| 32 | index 1e718a2..187c399 100644 |
| 33 | --- a/agent/tcf/framework/mdep.h |
| 34 | +++ b/agent/tcf/framework/mdep.h |
| 35 | @@ -276,7 +276,7 @@ extern int loc_clock_gettime(int, struct timespec *); |
| 36 | |
| 37 | #define O_BINARY 0 |
| 38 | |
| 39 | -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) |
| 40 | +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || !defined(__GLIBC__) |
| 41 | # define O_LARGEFILE 0 |
| 42 | extern char ** environ; |
| 43 | extern char * canonicalize_file_name(const char * path); |
| 44 | -- |
| 45 | 2.7.0 |
| 46 | |