diff options
| author | Mikko Koppanen <mkoppanen@php.net> | 2011-08-15 19:09:04 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2011-08-15 19:09:04 +0200 |
| commit | 0354d4d37fe814b9dbb94415da2c5314c4b68ae6 (patch) | |
| tree | 76f28b549153ea51679069c11ea5254c5496c5e1 | |
| parent | 57440b86e2c62c78f3904abb17f11500ba0a1a6f (diff) | |
Added Android support
Signed-off-by: Mikko Koppanen <mkoppanen@php.net>
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | src/zmq.cpp | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 3fda5f0..e6da48d 100644 --- a/configure.in +++ b/configure.in @@ -90,6 +90,12 @@ case "${host_os}" in fi AC_DEFINE(ZMQ_HAVE_LINUX, 1, [Have Linux OS]) AC_CHECK_LIB(rt, sem_init) + + case "${host_os}" in + *android*) + AC_DEFINE(ZMQ_HAVE_ANDROID, 1, [Have Android OS]) + ;; + esac ;; *solaris*) # Define on Solaris to enable all library features diff --git a/src/zmq.cpp b/src/zmq.cpp index 1ea08f8..0f54fab 100644 --- a/src/zmq.cpp +++ b/src/zmq.cpp @@ -352,6 +352,9 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_) #if defined ZMQ_HAVE_WINDOWS Sleep (timeout_ > 0 ? timeout_ : INFINITE); return 0; +#elif defined ZMQ_HAVE_ANDROID + usleep (timeout_ * 1000); + return 0; #else return usleep (timeout_ * 1000); #endif |