diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-19 11:41:31 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-19 11:41:31 -0300 |
commit | 8a79dffbc1b5f55765698c420217bb06f67bb684 (patch) | |
tree | 8f8b0ee50fcd68c6572d7e7f8ce26150ac1dd430 /extra/moc | |
parent | 35d3377392b5d0678453096f87df70faf87f72c6 (diff) | |
parent | 5457eacc747fc3f91e10a1f452230b1feac39eff (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/camlp5-transitional/PKGBUILD
community/camlp5/PKGBUILD
community/compizconfig-backend-kconfig/PKGBUILD
community/libtrash/PKGBUILD
community/mediastreamer/PKGBUILD
community/python-pycurl/PKGBUILD
extra/alpine/PKGBUILD
extra/anjuta-extras/PKGBUILD
extra/aufs2-util/PKGBUILD
extra/bitlbee/PKGBUILD
extra/cups/PKGBUILD
extra/dotconf/PKGBUILD
extra/fbida/PKGBUILD
extra/fvwm-devel/PKGBUILD
extra/libdmtx/PKGBUILD
extra/libindi/PKGBUILD
extra/mousepad/PKGBUILD
extra/pysmbc/PKGBUILD
extra/rcs/PKGBUILD
extra/xfprint/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
multilib/lib32-llvm/PKGBUILD
multilib/lib32-llvm/cindexer-clang-path.patch
multilib/lib32-llvm/clang-plugin-loader-registry.patch
multilib/lib32-llvm/clang-pure64.patch
multilib/lib32-llvm/clang-toolchains-gcc-versions.patch
multilib/lib32-llvm/enable-lto.patch
multilib/lib32-mesa/PKGBUILD
testing/mesa/PKGBUILD
testing/perl/ChangeLog
testing/perl/PKGBUILD
Diffstat (limited to 'extra/moc')
-rw-r--r-- | extra/moc/curl-streams.diff | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/extra/moc/curl-streams.diff b/extra/moc/curl-streams.diff deleted file mode 100644 index 2dbc38d54..000000000 --- a/extra/moc/curl-streams.diff +++ /dev/null @@ -1,28 +0,0 @@ -diff -u moc-2.4.4/io_curl.c moc-2.4.4/io_curl.c ---- a/io_curl.c 2007-07-08 08:54:45.000000000 +0200 -+++ b/io_curl.c 2011-05-18 09:09:40.000000000 +0200 -@@ -338,6 +338,8 @@ - fd_set read_fds, write_fds, exc_fds; - int max_fd; - int ret; -+ long milliseconds; -+ struct timeval timeout; - - logit ("Doing select()..."); - -@@ -356,8 +358,14 @@ - if (s->curl.wake_up_pipe[0] > max_fd) - max_fd = s->curl.wake_up_pipe[0]; - -+ curl_multi_timeout(s->curl.multi_handle, &milliseconds); -+ if(milliseconds <= 0) -+ milliseconds = 1000; /* just a cautionary default */ -+ timeout.tv_sec = milliseconds / 1000; -+ timeout.tv_usec = (milliseconds % 1000) * 1000; -+ - ret = select (max_fd + 1, &read_fds, &write_fds, -- &exc_fds, NULL); -+ &exc_fds, &timeout); - - if (ret < 0 && errno == EINTR) { - logit ("Interrupted"); |