Unbreak php7 fix for php <= 7.0

michael-grunder · michael-grunder · commit d22e7f5a5cb7 · 2016-11-22T18:05:13.000-08:00
diff --git a/cluster_library.h b/cluster_library.h
@@ -173,6 +173,10 @@ typedef struct clusterFoldItem clusterFoldItem;
 
 /* RedisCluster implementation structure */
 typedef struct redisCluster {
+#if (PHP_MAJOR_VERSION < 7)
+    zend_object std;
+#endif
+
     /* Timeout and read timeout (for normal operations) */
     double timeout;
     double read_timeout;
@@ -242,8 +246,10 @@ typedef struct redisCluster {
     unsigned short     redir_slot;
     unsigned short     redir_port;
 
+#if (PHP_MAJOR_VERSION >= 7)
     /* Zend object handler */
     zend_object std;
+#endif
 } redisCluster;
 
 /* RedisCluster response processing callback */
diff --git a/redis_cluster.c b/redis_cluster.c
@@ -342,7 +342,11 @@ create_cluster_context(zend_class_entry *class_type TSRMLS_DC) {
 
 /* Helper to retrieve the redisCluster object from the zend_object member */
 static redisCluster *getClusterObject(zend_object *object) {
+#if (PHP_MAJOR_VERSION < 7)
+    return (redisCluster*)object;
+#else
     return (redisCluster*)((char*)(object) - XtOffsetOf(redisCluster, std));
+#endif
 }
 
 /* Free redisCluster context */
