Commit | Line | Data |
---|---|---|
59f0d218 FF |
1 | diff -u -r ../multitail-6.2.1/utils.c ./utils.c |
2 | --- ../multitail-6.2.1/utils.c 2014-02-16 15:06:54.000000000 +0100 | |
3 | +++ ./utils.c 2014-06-30 16:50:19.000000000 +0200 | |
4 | @@ -95,7 +95,7 @@ | |
5 | ||
6 | void get_load_values(double *v1, double *v2, double *v3) | |
7 | { | |
8 | -#if !defined(__UCLIBC__) && (defined(__FreeBSD__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__GNU__) || defined(__sun) || defined(sun)) | |
9 | +#if !defined(__ANDROID__) && !defined(__UCLIBC__) && (defined(__FreeBSD__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__GNU__) || defined(__sun) || defined(sun)) | |
10 | #if defined(__GLIBC__) && ( __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2)) | |
11 | /* Older glibc doesn't have getloadavg() - use sysinfo() */ | |
12 | /* thanks to Ville Herva for this code! */ | |
13 | @@ -367,7 +367,7 @@ | |
14 | ||
15 | for(;;) | |
16 | { | |
17 | - fd = open64(path, mode); | |
18 | + fd = open(path, mode); | |
19 | if (fd == -1) | |
20 | { | |
21 | if (errno == EINTR || errno == EAGAIN) /* for AIX */ |