Merge pull request phpredis#660 from Jan-E/php7

michael-grunder · michael-grunder · commit ea98401c14b1 · 2015-10-02T13:25:31.000-07:00
VC14 fixes (2) and a test fix
diff --git a/config.w32 b/config.w32
@@ -7,7 +7,6 @@ ARG_ENABLE("redis-igbinary", "whether to enable igbinary serializer support", "n
 if (PHP_REDIS != "no") {
 	var sources = "redis.c redis_commands.c library.c redis_session.c redis_array.c redis_array_impl.c redis_cluster.c cluster_library.c";
 	if (PHP_REDIS_SESSION != "no") {
-		ADD_SOURCES(configure_module_dirname, "redis_session.c", "redis");
 		ADD_EXTENSION_DEP("redis", "session");
 		ADD_FLAG("CFLAGS_REDIS", ' /D PHP_SESSION=1 ');
 		AC_DEFINE("HAVE_REDIS_SESSION", 1);
diff --git a/library.c b/library.c
@@ -34,6 +34,9 @@
         /* This proto is available from 5.5 on only */
         PHP_REDIS_API int usleep(unsigned int useconds);
     # endif
+    # if PHP_MAJOR_VERSION >= 7
+        PHP_REDIS_API int usleep(unsigned int useconds);
+    # endif
 #endif
 
 extern zend_class_entry *redis_ce;
diff --git a/redis_commands.h b/redis_commands.h
@@ -11,9 +11,6 @@
    };
    int gettimeofday(struct timeval *tv, struct timezone *tz);
 # endif
-# if defined(HAVE_USLEEP)
-   int usleep(unsigned int useconds);
-# endif
 #endif
 
 #include "common.h"
diff --git a/tests/RedisTest.php b/tests/RedisTest.php
@@ -1920,7 +1920,7 @@ public function testBRpopLpush() {
 
     public function testZAddFirstArg() {
 
-        $this->redis->del('key');
+        $this->redis->del('100');
 
         $zsetName = 100; // not a string!
         $this->assertTrue(1 === $this->redis->zAdd($zsetName, 0, 'val0'));
