- Simplify SPL checks for PDOException base

diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c
index eb541dfdc4032ba5f3c34a5a47cdabc844df6e88..2a77257dd88e81cccddd05cbf02f27be3eccdf15 100755 (executable)
--- a/ext/pdo/pdo.c
+++ b/ext/pdo/pdo.c
@@ -69,7 +69,7 @@ PDO_API char *php_pdo_str_tolower_dup(const char *src, int len)
 
 PDO_API zend_class_entry *php_pdo_get_exception_base(int root TSRMLS_DC)
 {
-#if can_handle_soft_dependency_on_SPL && defined(HAVE_SPL) && ((PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1))
+#if can_handle_soft_dependency_on_SPL && defined(HAVE_SPL)
        if (!root) {
                return spl_ce_RuntimeException;
        }
@@ -317,7 +317,7 @@ PHP_MINIT_FUNCTION(pdo)
                "PDO persistent database", module_number);
 
        INIT_CLASS_ENTRY(ce, "PDOException", NULL);
-#if can_handle_soft_dependency_on_SPL && defined(HAVE_SPL) && ((PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1))
+#if can_handle_soft_dependency_on_SPL && defined(HAVE_SPL)
        pdo_exception_ce = zend_register_internal_class_ex(&ce, spl_ce_RuntimeException, NULL TSRMLS_CC);
 #else
        pdo_exception_ce = zend_register_internal_class_ex(&ce, zend_exception_get_default(TSRMLS_C), NULL TSRMLS_CC);

diff --git a/ext/pdo/php_pdo.h b/ext/pdo/php_pdo.h
index 7f9b85ceb2f4ea9f7ba2a913d8598a9cc83fc073..63499575c652cf70a253723c200b5812e3ac7ca3 100755 (executable)
--- a/ext/pdo/php_pdo.h
+++ b/ext/pdo/php_pdo.h
@@ -24,7 +24,7 @@
 #include "zend.h"
 
 #if PHP_MAJOR_VERSION > 5 || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1)
-#define can_handle_soft_dependency_on_SPL
+#define can_handle_soft_dependency_on_SPL 1
 #endif
 
 extern zend_module_entry pdo_module_entry;