| 1 | diff -u -r ../fish-2.4b1/src/env_universal_common.cpp ./src/env_universal_common.cpp |
| 2 | --- ../fish-2.4b1/src/env_universal_common.cpp 2016-10-18 10:17:06.000000000 -0400 |
| 3 | +++ ./src/env_universal_common.cpp 2016-10-19 17:42:06.900520935 -0400 |
| 4 | @@ -137,7 +137,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 | debug(0, |
| 13 | @@ -987,6 +987,7 @@ |
| 14 | return result; |
| 15 | } |
| 16 | |
| 17 | +#ifndef __ANDROID__ |
| 18 | class universal_notifier_shmem_poller_t : public universal_notifier_t { |
| 19 | // This is what our shared memory looks like. Everything here is stored in network byte order |
| 20 | // (big-endian). |
| 21 | @@ -1127,6 +1128,7 @@ |
| 22 | return usec_per_sec / 3; // 3 times a second |
| 23 | } |
| 24 | }; |
| 25 | +#endif |
| 26 | |
| 27 | /// A notifyd-based notifier. Very straightforward. |
| 28 | class universal_notifier_notifyd_t : public universal_notifier_t { |
| 29 | @@ -1410,7 +1412,9 @@ |
| 30 | const char *name; |
| 31 | universal_notifier_t::notifier_strategy_t strat; |
| 32 | } options[] = {{"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 | const size_t opt_count = sizeof options / sizeof *options; |
| 39 | @@ -1463,9 +1467,11 @@ |
| 40 | strat = resolve_default_strategy(); |
| 41 | } |
| 42 | switch (strat) { |
| 43 | +#ifndef __ANDROID__ |
| 44 | case strategy_shmem_polling: { |
| 45 | return new universal_notifier_shmem_poller_t(); |
| 46 | } |
| 47 | +#endif |
| 48 | case strategy_notifyd: { |
| 49 | return new universal_notifier_notifyd_t(); |
| 50 | } |