MFH

diff --git a/ext/mcve/mcve.c b/ext/mcve/mcve.c
index e2140b95be3e1b40545ac7b1aeee7649dcec8120..1f971d64d5b99c372025e7abceb5047539896988 100644 (file)
--- a/ext/mcve/mcve.c
+++ b/ext/mcve/mcve.c
@@ -39,7 +39,7 @@ static int mcve_init;  /* For Safe Memory Deallocation */
 /* {{{ extension definition structures */
 static unsigned char second_arg_force_ref[] = { 2, BYREF_NONE, BYREF_FORCE };
 
-function_entry php_mcve_functions[] = {
+function_entry mcve_functions[] = {
        PHP_FE(mcve_initengine,                 NULL)
        PHP_FE(mcve_initconn,                   NULL)
        PHP_FE(mcve_deleteresponse,             NULL)
@@ -120,12 +120,12 @@ function_entry php_mcve_functions[] = {
        { NULL, NULL, NULL }
 };
 
-zend_module_entry php_mcve_module_entry = {
+zend_module_entry mcve_module_entry = {
 #if ZEND_MODULE_API_NO >= 20010901
        STANDARD_MODULE_HEADER,
 #endif
        "mcve",                 /* module name */
-       php_mcve_functions,     /* struct of functions (see above) */
+       mcve_functions, /* struct of functions (see above) */
        PHP_MINIT(mcve),        /* module initialization functions */
        NULL,                   /* module shutdown functions */
        NULL,                   /* request initialization functions */

diff --git a/ext/mcve/php_mcve.h b/ext/mcve/php_mcve.h
index bc4b8bfac2f5f2b1dc94b81b2229f1ad630dc75a..43183633c4efc5992604849dd4677e8075bb91fd 100644 (file)
--- a/ext/mcve/php_mcve.h
+++ b/ext/mcve/php_mcve.h
@@ -20,9 +20,9 @@
 #ifndef _PHP_MCVE_H
 #define _PHP_MCVE_H
 
-extern zend_module_entry php_mcve_module_entry;
+extern zend_module_entry mcve_module_entry;
 
-#define mcve_module_ptr &php_mcve_module_entry
+#define mcve_module_ptr &mcve_module_entry
 #define phpext_mcve_ptr mcve_module_ptr
 
 #define PHP_MCVE_VERSION       "3.0"

diff --git a/ext/mcve/tests/001.phpt b/ext/mcve/tests/001.phpt
index c41eaa18cafc185d8f393b3a3eb214de3cbe89ec..ba4b5f13d4f1d395a4f186fe040056d1ef7cbdde 100644 (file)
--- a/ext/mcve/tests/001.phpt
+++ b/ext/mcve/tests/001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for mcve presence
 --SKIPIF--
-<?php if (!extension_loaded("MCVE")) print "skip"; ?>
+<?php if (!extension_loaded("mcve")) print "skip"; ?>
 --POST--
 --GET--
 --FILE--