| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | gzip uses gnulib, whose header conflict with glibc. This patch rename some function to avoid conflict. |
| 2 | |
| 3 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> |
| 4 | |
| 5 | Upstream-Status: Inappropriate [licensing] |
| 6 | |
| 7 | Index: gzip-1.3.12/gzip.c |
| 8 | =================================================================== |
| 9 | --- gzip-1.3.12.orig/gzip.c 2010-08-13 10:29:38.000000000 +0800 |
| 10 | +++ gzip-1.3.12/gzip.c 2010-08-13 10:29:44.000000000 +0800 |
| 11 | @@ -1637,7 +1637,7 @@ |
| 12 | } |
| 13 | } |
| 14 | |
| 15 | - if (futimens (ofd, ofname, timespec) != 0) |
| 16 | + if (futimens_gnulib (ofd, ofname, timespec) != 0) |
| 17 | { |
| 18 | int e = errno; |
| 19 | WARN ((stderr, "%s: ", program_name)); |
| 20 | Index: gzip-1.3.12/lib/utimens.c |
| 21 | =================================================================== |
| 22 | --- gzip-1.3.12.orig/lib/utimens.c 2010-08-13 10:33:47.000000000 +0800 |
| 23 | +++ gzip-1.3.12/lib/utimens.c 2010-08-13 10:34:02.000000000 +0800 |
| 24 | @@ -75,7 +75,7 @@ |
| 25 | Return 0 on success, -1 (setting errno) on failure. */ |
| 26 | |
| 27 | int |
| 28 | -futimens (int fd ATTRIBUTE_UNUSED, |
| 29 | +futimens_gnulib (int fd ATTRIBUTE_UNUSED, |
| 30 | char const *file, struct timespec const timespec[2]) |
| 31 | { |
| 32 | /* Some Linux-based NFS clients are buggy, and mishandle time stamps |
| 33 | @@ -185,5 +185,5 @@ |
| 34 | int |
| 35 | utimens (char const *file, struct timespec const timespec[2]) |
| 36 | { |
| 37 | - return futimens (-1, file, timespec); |
| 38 | + return futimens_gnulib (-1, file, timespec); |
| 39 | } |
| 40 | Index: gzip-1.3.12/lib/utimens.h |
| 41 | =================================================================== |
| 42 | --- gzip-1.3.12.orig/lib/utimens.h 2010-08-13 10:14:57.000000000 +0800 |
| 43 | +++ gzip-1.3.12/lib/utimens.h 2010-08-13 10:21:45.000000000 +0800 |
| 44 | @@ -1,3 +1,3 @@ |
| 45 | #include <time.h> |
| 46 | -int futimens (int, char const *, struct timespec const [2]); |
| 47 | +int futimens_gnulib (int, char const *, struct timespec const [2]); |
| 48 | int utimens (char const *, struct timespec const [2]); |