|
| 1 | +diff -ur /home/max/workspace/gevent-1.0rc2/libev/ev.c gevent-1.0rc2/libev/ev.c |
| 2 | +--- /home/max/workspace/gevent-1.0rc2/libev/ev.c 2013-04-03 05:38:12.000000000 +0800 |
| 3 | ++++ gevent-1.0rc2/libev/ev.c 2013-04-16 16:57:07.315889108 +0800 |
| 4 | +@@ -464,7 +464,6 @@ |
| 5 | + * This value is good at least till the year 4000. |
| 6 | + */ |
| 7 | + #define MIN_INTERVAL 0.0001220703125 /* 1/2**13, good till 4000 */ |
| 8 | +-/*#define MIN_INTERVAL 0.00000095367431640625 /* 1/2**20, good till 2200 */ |
| 9 | + |
| 10 | + #define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ |
| 11 | + #define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ |
| 12 | +@@ -617,9 +616,6 @@ |
| 13 | + #if ECB_GCC_VERSION(4,7) |
| 14 | + /* see comment below (stdatomic.h) about the C11 memory model. */ |
| 15 | + #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST) |
| 16 | +- #elif defined __clang && __has_feature (cxx_atomic) |
| 17 | +- /* see comment below (stdatomic.h) about the C11 memory model. */ |
| 18 | +- #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST) |
| 19 | + #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ |
| 20 | + #define ECB_MEMORY_FENCE __sync_synchronize () |
| 21 | + #elif _MSC_VER >= 1400 /* VC++ 2005 */ |
| 22 | +diff -ur /home/max/workspace/gevent-1.0rc2/libev/ev_select.c gevent-1.0rc2/libev/ev_select.c |
| 23 | +--- /home/max/workspace/gevent-1.0rc2/libev/ev_select.c 2013-04-03 05:38:12.000000000 +0800 |
| 24 | ++++ gevent-1.0rc2/libev/ev_select.c 2013-04-16 16:44:09.407889199 +0800 |
| 25 | +@@ -65,6 +65,10 @@ |
| 26 | + # define NFDBYTES (NFDBITS / 8) |
| 27 | + #endif |
| 28 | + |
| 29 | ++#ifdef ANDROID |
| 30 | ++typedef int fd_mask; |
| 31 | ++#endif |
| 32 | ++ |
| 33 | + #include <string.h> |
| 34 | + |
| 35 | + static void |
| 36 | +diff -ur /home/max/workspace/gevent-1.0rc2/setup.py gevent-1.0rc2/setup.py |
| 37 | +--- /home/max/workspace/gevent-1.0rc2/setup.py 2013-04-03 05:38:12.000000000 +0800 |
| 38 | ++++ gevent-1.0rc2/setup.py 2013-04-16 16:54:12.783889127 +0800 |
| 39 | +@@ -51,8 +51,8 @@ |
| 40 | + |
| 41 | + define_macros = [] |
| 42 | + libraries = [] |
| 43 | +-libev_configure_command = ["/bin/sh", abspath('libev/configure'), '> configure-output.txt'] |
| 44 | +-ares_configure_command = ["/bin/sh", abspath('c-ares/configure'), 'CONFIG_COMMANDS= CONFIG_FILES= > configure-output.txt'] |
| 45 | ++libev_configure_command = ["/bin/sh", abspath('libev/configure --host=arm-linux'), '> configure-output.txt'] |
| 46 | ++ares_configure_command = ["/bin/sh", abspath('c-ares/configure --host=arm-linux'), 'CONFIG_COMMANDS= CONFIG_FILES= > configure-output.txt'] |
| 47 | + |
| 48 | + |
| 49 | + if sys.platform == 'win32': |
0 commit comments