| 1 | diff -u -r ../fish-2.3.1/src/env_universal_common.cpp ./src/env_universal_common.cpp |
| 2 | --- ../fish-2.3.1/src/env_universal_common.cpp 2016-07-03 08:15:45.000000000 -0400 |
| 3 | +++ ./src/env_universal_common.cpp 2016-08-05 09:18:38.753535780 -0400 |
| 4 | @@ -166,7 +166,7 @@ |
| 5 | } |
| 6 | |
| 7 | // /tmp/fish.user |
| 8 | - std::string tmpdir = "/tmp/fish."; |
| 9 | + std::string tmpdir = "@TERMUX_PREFIX@/tmp/fish."; |
| 10 | tmpdir.append(uname); |
| 11 | if (check_runtime_path(tmpdir.c_str()) != 0) |
| 12 | { |
| 13 | @@ -1141,6 +1141,7 @@ |
| 14 | return result; |
| 15 | } |
| 16 | |
| 17 | +#ifndef __ANDROID__ |
| 18 | class universal_notifier_shmem_poller_t : public universal_notifier_t |
| 19 | { |
| 20 | /* This is what our shared memory looks like. Everything here is stored in network byte order (big-endian) */ |
| 21 | @@ -1304,6 +1305,7 @@ |
| 22 | } |
| 23 | } |
| 24 | }; |
| 25 | +#endif |
| 26 | |
| 27 | /* A notifyd-based notifier. Very straightforward. */ |
| 28 | class universal_notifier_notifyd_t : public universal_notifier_t |
| 29 | @@ -1625,7 +1627,9 @@ |
| 30 | } options[] = |
| 31 | { |
| 32 | {"default", universal_notifier_t::strategy_default}, |
| 33 | +#ifndef __ANDROID__ |
| 34 | {"shmem", universal_notifier_t::strategy_shmem_polling}, |
| 35 | +#endif |
| 36 | {"pipe", universal_notifier_t::strategy_named_pipe}, |
| 37 | {"notifyd", universal_notifier_t::strategy_notifyd} |
| 38 | }; |
| 39 | @@ -1687,8 +1691,10 @@ |
| 40 | } |
| 41 | switch (strat) |
| 42 | { |
| 43 | +#ifndef __ANDROID__ |
| 44 | case strategy_shmem_polling: |
| 45 | return new universal_notifier_shmem_poller_t(); |
| 46 | +#endif |
| 47 | |
| 48 | case strategy_notifyd: |
| 49 | return new universal_notifier_notifyd_t(); |