]> granicus.if.org Git - php/commitdiff
- Also check module API number
authorAndi Gutmans <andi@php.net>
Mon, 13 Mar 2000 06:00:36 +0000 (06:00 +0000)
committerAndi Gutmans <andi@php.net>
Mon, 13 Mar 2000 06:00:36 +0000 (06:00 +0000)
ext/standard/dl.c

index b9bfb288e578f8493e7193fe59c66a8f0bdfef75..651b84e665de71cc82d2d912cdac96b4f3be718d 100644 (file)
@@ -132,14 +132,15 @@ void php_dl(pval *file,int type,pval *return_value)
                RETURN_FALSE;
        }
        module_entry = get_module();
-       if ((module_entry->zend_debug != ZEND_DEBUG) || (module_entry->zts != USING_ZTS)) {
+       if ((module_entry->zend_debug != ZEND_DEBUG) || (module_entry->zts != USING_ZTS)
+               || (module_entry->zend_api != ZEND_MODULE_API_NO)) {
                php_error(E_CORE_WARNING,
                                        "%s: Unable to initialize module\n"
-                                       "Module compiled with debug=%d, thread-safety=%d\n"
-                                       "PHP compiled with debug=%d, thread-safety=%d\n"
+                                       "Module compiled with debug=%d, thread-safety=%d module API=%d\n"
+                                       "PHP compiled with debug=%d, thread-safety=%d module API=%d\n"
                                        "These options need to match\n",
-                                       module_entry->name, module_entry->zend_debug, module_entry->zts,
-                                       ZEND_DEBUG, USING_ZTS);
+                                       module_entry->name, module_entry->zend_debug, module_entry->zts, module_entry->zend_api,
+                                       ZEND_DEBUG, USING_ZTS, ZEND_MODULE_API_NO);
                DL_UNLOAD(handle);
                RETURN_FALSE;
        }