| 1 | diff -u -r ../fish-2.2.0/env_universal_common.cpp ./env_universal_common.cpp |
| 2 | --- ../fish-2.2.0/env_universal_common.cpp 2015-07-03 15:46:59.000000000 -0400 |
| 3 | +++ ./env_universal_common.cpp 2015-07-13 02:16:14.591286575 -0400 |
| 4 | @@ -1089,6 +1089,7 @@ |
| 5 | return result; |
| 6 | } |
| 7 | |
| 8 | +#ifndef __ANDROID__ |
| 9 | class universal_notifier_shmem_poller_t : public universal_notifier_t |
| 10 | { |
| 11 | /* This is what our shared memory looks like. Everything here is stored in network byte order (big-endian) */ |
| 12 | @@ -1251,6 +1252,7 @@ |
| 13 | } |
| 14 | } |
| 15 | }; |
| 16 | +#endif |
| 17 | |
| 18 | /* A notifyd-based notifier. Very straightforward. */ |
| 19 | class universal_notifier_notifyd_t : public universal_notifier_t |
| 20 | @@ -1572,7 +1574,9 @@ |
| 21 | } options[] = |
| 22 | { |
| 23 | {"default", universal_notifier_t::strategy_default}, |
| 24 | +#ifndef __ANDROID__ |
| 25 | {"shmem", universal_notifier_t::strategy_shmem_polling}, |
| 26 | +#endif |
| 27 | {"pipe", universal_notifier_t::strategy_named_pipe}, |
| 28 | {"notifyd", universal_notifier_t::strategy_notifyd} |
| 29 | }; |
| 30 | @@ -1632,8 +1636,10 @@ |
| 31 | } |
| 32 | switch (strat) |
| 33 | { |
| 34 | +#ifndef __ANDROID__ |
| 35 | case strategy_shmem_polling: |
| 36 | return new universal_notifier_shmem_poller_t(); |
| 37 | +#endif |
| 38 | |
| 39 | case strategy_notifyd: |
| 40 | return new universal_notifier_notifyd_t(); |