PHP_FE_END + ZEND_MOD_END

yatsukhnenko · yatsukhnenko · commit 5ee32baee60d · 2016-12-20T11:06:59.000+02:00
diff --git a/common.h b/common.h
@@ -363,6 +363,17 @@ extern void (*_php_var_serialize)(smart_str *, zval **, php_serialize_data_t * T
 extern int (*_php_var_unserialize)(zval **, const unsigned char **, const unsigned char *, php_unserialize_data_t * TSRMLS_DC);
 #define php_var_unserialize(rval, p, max, var_hash) _php_var_unserialize(&rval, p, max, var_hash TSRMLS_CC)
 typedef int strlen_t;
+
+/* PHP_MOD_END exists since 5.3.7 */
+#ifndef ZEND_MOD_END
+#define ZEND_MOD_END { NULL, NULL, NULL, 0 }
+#endif
+
+/* PHP_FE_END exists since 5.3.7 */
+#ifndef PHP_FE_END
+#define PHP_FE_END { NULL, NULL, NULL }
+#endif
+
 #else
 #include <zend_smart_str.h>
 #include <ext/standard/php_smart_string.h>
diff --git a/redis.c b/redis.c
@@ -343,12 +343,7 @@ static zend_function_entry redis_functions[] = {
 
      PHP_MALIAS(Redis, evaluate, eval, NULL, ZEND_ACC_PUBLIC)
      PHP_MALIAS(Redis, evaluateSha, evalsha, NULL, ZEND_ACC_PUBLIC)
-/* PHP_FE_END exists since 5.3.7 */
-#ifdef PHP_FE_END
      PHP_FE_END
-#else
-     {NULL, NULL, NULL}
-#endif
 };
 
 static const zend_module_dep redis_deps[] = {
diff --git a/redis_array.c b/redis_array.c
@@ -89,12 +89,7 @@ zend_function_entry redis_array_functions[] = {
      /* Aliases */
      PHP_MALIAS(RedisArray, delete, del, NULL, ZEND_ACC_PUBLIC)
      PHP_MALIAS(RedisArray, getMultiple, mget, NULL, ZEND_ACC_PUBLIC)
-/* PHP_FE_END exists since 5.3.7 */
-#ifdef PHP_FE_END
      PHP_FE_END
-#else
-     {NULL, NULL, NULL}
-#endif
 };
 
 static void redis_array_free(RedisArray *ra) {
diff --git a/redis_cluster.c b/redis_cluster.c
@@ -227,12 +227,7 @@ zend_function_entry redis_cluster_functions[] = {
     PHP_ME(RedisCluster, geodist, NULL, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, georadius, NULL, ZEND_ACC_PUBLIC)
     PHP_ME(RedisCluster, georadiusbymember, NULL, ZEND_ACC_PUBLIC)
-/* PHP_FE_END exists since 5.3.7 */
-#ifdef PHP_FE_END
-     PHP_FE_END
-#else
-     {NULL, NULL, NULL}
-#endif
+    PHP_FE_END
 };
 
 /* Our context seeds will be a hash table with RedisSock* pointers */
