You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
40 lines
1.3 KiB
40 lines
1.3 KiB
diff -u -r ../fish-2.2.0/env_universal_common.cpp ./env_universal_common.cpp
|
|
--- ../fish-2.2.0/env_universal_common.cpp 2015-07-03 15:46:59.000000000 -0400
|
|
+++ ./src/env_universal_common.cpp 2015-07-13 02:16:14.591286575 -0400
|
|
@@ -1089,6 +1089,7 @@
|
|
return result;
|
|
}
|
|
|
|
+#ifndef __ANDROID__
|
|
class universal_notifier_shmem_poller_t : public universal_notifier_t
|
|
{
|
|
/* This is what our shared memory looks like. Everything here is stored in network byte order (big-endian) */
|
|
@@ -1251,6 +1252,7 @@
|
|
}
|
|
}
|
|
};
|
|
+#endif
|
|
|
|
/* A notifyd-based notifier. Very straightforward. */
|
|
class universal_notifier_notifyd_t : public universal_notifier_t
|
|
@@ -1572,7 +1574,9 @@
|
|
} options[] =
|
|
{
|
|
{"default", universal_notifier_t::strategy_default},
|
|
+#ifndef __ANDROID__
|
|
{"shmem", universal_notifier_t::strategy_shmem_polling},
|
|
+#endif
|
|
{"pipe", universal_notifier_t::strategy_named_pipe},
|
|
{"notifyd", universal_notifier_t::strategy_notifyd}
|
|
};
|
|
@@ -1632,8 +1636,10 @@
|
|
}
|
|
switch (strat)
|
|
{
|
|
+#ifndef __ANDROID__
|
|
case strategy_shmem_polling:
|
|
return new universal_notifier_shmem_poller_t();
|
|
+#endif
|
|
|
|
case strategy_notifyd:
|
|
return new universal_notifier_notifyd_t();
|
|
|