Use static declarations for spl_ce_RuntimeException decl

jmikola · jmikola · commit a9857d6995a6 · 2016-07-19T11:11:58.000+02:00
This is consistent with the PDO extension, which also resolves the RuntimeException class entry on-demand. Without a static decl, this can conflict with the extern decls in spl_exceptions.h and cause a "missing symbol" error for other extensions depending on those SPL decls.

This commit also makes the spl_rte_ce decl in redis_cluster.c static for consistency, although that symbol does not currently conflict with anything in SPL.
diff --git a/redis.c b/redis.c
@@ -60,7 +60,7 @@ extern zend_class_entry *redis_cluster_ce;
 zend_class_entry *redis_ce;
 zend_class_entry *redis_exception_ce;
 extern zend_class_entry *redis_cluster_exception_ce;
-zend_class_entry *spl_ce_RuntimeException = NULL;
+static zend_class_entry *spl_ce_RuntimeException = NULL;
 
 extern zend_function_entry redis_array_functions[];
 extern zend_function_entry redis_cluster_functions[];
diff --git a/redis_cluster.c b/redis_cluster.c
@@ -36,7 +36,7 @@ zend_class_entry *redis_cluster_ce;
 
 /* Exception handler */
 zend_class_entry *redis_cluster_exception_ce;
-zend_class_entry *spl_rte_ce = NULL;
+static zend_class_entry *spl_rte_ce = NULL;
 
 /* Argument info for HSCAN, SSCAN, HSCAN */
 ZEND_BEGIN_ARG_INFO_EX(arginfo_kscan_cl, 0, 0, 2)
