- got rid of php_ prefix in Modulename and some structs

diff --git a/ext/domxml/php_domxml.c b/ext/domxml/php_domxml.c
index 6ceb696fde33d079bb05290c27f83594bff6202b..7ddd1e1c63224a95515077dfb792cdbbd88af962 100644 (file)
--- a/ext/domxml/php_domxml.c
+++ b/ext/domxml/php_domxml.c
@@ -41,7 +41,7 @@ static zend_class_entry *domxmltestnode_class_entry_ptr;
 static int node_attributes(zval **attributes, xmlNode *nodep);
 static int node_children(zval **children, xmlNode *nodep);
 
-static zend_function_entry php_domxml_functions[] = {
+static zend_function_entry domxml_functions[] = {
        PHP_FE(xmldoc,  NULL)
        PHP_FE(xmldocfile,      NULL)
        PHP_FE(xmltree, NULL)
@@ -103,12 +103,12 @@ static zend_function_entry php_domxmlns_class_functions[] = {
 void domxmltestnode_class_startup();
 #endif
 
-zend_module_entry php_domxml_module_entry = {
-       "domxml", php_domxml_functions, PHP_MINIT(domxml), NULL, NULL, NULL, PHP_MINFO(domxml), STANDARD_MODULE_PROPERTIES
+zend_module_entry domxml_module_entry = {
+       "domxml", domxml_functions, PHP_MINIT(domxml), NULL, NULL, NULL, PHP_MINFO(domxml), STANDARD_MODULE_PROPERTIES
 };
 
 #ifdef COMPILE_DL_DOMXML
-ZEND_GET_MODULE(php_domxml)
+ZEND_GET_MODULE(domxml)
 #endif
 
 void _free_node(xmlNode *tmp) {

diff --git a/ext/domxml/php_domxml.h b/ext/domxml/php_domxml.h
index 0dc4fb3d96e705a54b5814a9ca6eb40639190aa2..b491a3e5b0134daffdc6ccce8e43e7b3f83f9b37 100644 (file)
--- a/ext/domxml/php_domxml.h
+++ b/ext/domxml/php_domxml.h
@@ -24,8 +24,8 @@
 #if HAVE_DOMXML
 #include <libxml/parser.h>
 
-extern zend_module_entry php_domxml_module_entry;
-#define php_domxml_module_ptr &php_domxml_module_entry
+extern zend_module_entry domxml_module_entry;
+#define domxml_module_ptr &domxml_module_entry
 
 /* directory functions */
 extern PHP_MINIT_FUNCTION(domxml);
@@ -56,8 +56,8 @@ PHP_FUNCTION(domxml_attrname);
 
 PHP_FUNCTION(domxml_test);
 #else
-#define php_domxml_module_ptr NULL
+#define domxml_module_ptr NULL
 #endif /* HAVE_DOMXML */
-#define phpext_domxml_ptr php_domxml_module_ptr
+#define phpext_domxml_ptr domxml_module_ptr
 
 #endif /* _PHP_DIR_H */