From 0d30dca5aaa72cedcb4177fb3dc9a977e00ae995 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Fri, 28 Mar 2014 23:50:09 +0100 Subject: [PATCH] Updated pthreads to 2.0.4 --- .travis.yml | 2 +- src/PocketMine/PocketMine.php | 4 ++-- src/build/compile.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9578bf1a1..e4e03fb47 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ branches: - Core-Rewrite before_script: - - pecl install channel://pecl.php.net/pthreads-2.0.2 + - pecl install channel://pecl.php.net/pthreads-2.0.4 - echo | pecl install channel://pecl.php.net/yaml-1.1.1 script: diff --git a/src/PocketMine/PocketMine.php b/src/PocketMine/PocketMine.php index b1eb527ea..06125b450 100644 --- a/src/PocketMine/PocketMine.php +++ b/src/PocketMine/PocketMine.php @@ -309,8 +309,8 @@ namespace PocketMine { if(substr_count($pthreads_version, ".") < 2){ $pthreads_version = "0.$pthreads_version"; } - if(version_compare($pthreads_version, "2.0.0") < 0){ - console("[ERROR] pthreads >= 2.0.0 is required, while you have $pthreads_version.", true, true, 0); + if(version_compare($pthreads_version, "2.0.4") < 0){ + console("[ERROR] pthreads >= 2.0.4 is required, while you have $pthreads_version.", true, true, 0); ++$errors; } } diff --git a/src/build/compile.sh b/src/build/compile.sh index 437be43c4..f735b0845 100644 --- a/src/build/compile.sh +++ b/src/build/compile.sh @@ -8,7 +8,7 @@ CURL_VERSION="curl-7_35_0" READLINE_VERSION="6.3" NCURSES_VERSION="5.9" PHPNCURSES_VERSION="1.0.2" -PTHREADS_VERSION="2.0.3" +PTHREADS_VERSION="2.0.4" WEAKREF_VERSION="0.2.2" PHPYAML_VERSION="1.1.1" YAML_VERSION="0.1.4"