| 1 | diff -u -r ../postgresql-10.1/src/timezone/zic.c ./src/timezone/zic.c |
| 2 | --- ../postgresql-10.1/src/timezone/zic.c 2017-11-07 01:46:52.000000000 +0100 |
| 3 | +++ ./src/timezone/zic.c 2017-11-11 19:32:52.836782026 +0100 |
| 4 | @@ -17,6 +17,12 @@ |
| 5 | #include "private.h" |
| 6 | #include "tzfile.h" |
| 7 | |
| 8 | +/* |
| 9 | + * Avoid the qsort->pg_qsort define to more easily build |
| 10 | + * a native patched zic tool. |
| 11 | + */ |
| 12 | +#undef qsort |
| 13 | + |
| 14 | #define ZIC_VERSION_PRE_2013 '2' |
| 15 | #define ZIC_VERSION '3' |
| 16 | |
| 17 | @@ -889,8 +895,16 @@ |
| 18 | progname, directory, fromfield, strerror(EPERM)); |
| 19 | exit(EXIT_FAILURE); |
| 20 | } |
| 21 | +#if 1 |
| 22 | + /* |
| 23 | + * Android does not support hard links starting from 6.0 |
| 24 | + * so always use symlinks. |
| 25 | + */ |
| 26 | + staysymlink = true; |
| 27 | +#else |
| 28 | if (staysymlink) |
| 29 | staysymlink = itssymlink(tofield); |
| 30 | +#endif |
| 31 | if (remove(tofield) == 0) |
| 32 | todirs_made = true; |
| 33 | else if (errno != ENOENT) |