cvs: php4(php_4_0_4) /ext/sablot php_sablot.h sablot.c
| From: | Sterling Hughes | Date: | Fri, 08 Dec 2000 12:57:43 +0000 |
| Subject: | cvs: php4(php_4_0_4) /ext/sablot php_sablot.h sablot.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-3028@lists.php.net to get a copy of this message | ||
sterling Fri Dec 8 04:57:43 2000 EDT
Branch: php_4_0_4
Modified files:
/php4/ext/sablot php_sablot.h sablot.c
Log:
Correct merge.
Index: php4/ext/sablot/php_sablot.h
diff -u php4/ext/sablot/php_sablot.h:1.7.2.2 php4/ext/sablot/php_sablot.h:1.7.2.3
--- php4/ext/sablot/php_sablot.h:1.7.2.2 Fri Dec 8 04:43:26 2000
+++ php4/ext/sablot/php_sablot.h Fri Dec 8 04:57:42 2000
@@ -37,9 +37,6 @@
PHP_MINFO_FUNCTION(sablot);
PHP_MSHUTDOWN_FUNCTION(sablot);
-/* Request functions */
-PHP_RSHUTDOWN_FUNCTION(sablot);
-
/* Output transformation functions */
PHP_FUNCTION(xslt_output_begintransform);
PHP_FUNCTION(xslt_output_endtransform);
Index: php4/ext/sablot/sablot.c
diff -u php4/ext/sablot/sablot.c:1.18.2.2 php4/ext/sablot/sablot.c:1.18.2.3
--- php4/ext/sablot/sablot.c:1.18.2.2 Fri Dec 8 04:43:26 2000
+++ php4/ext/sablot/sablot.c Fri Dec 8 04:57:42 2000
@@ -163,7 +163,7 @@
PHP_MINIT(sablot),
PHP_MSHUTDOWN(sablot),
NULL,
- PHP_RSHUTDOWN(sablot),
+ NULL,
PHP_MINFO(sablot),
STANDARD_MODULE_PROPERTIES
};
@@ -182,7 +182,7 @@
return SUCCESS;
}
-PHP_RSHUTDOWN_FUNCTION(sablot)
+PHP_MSHUTDOWN_FUNCTION(sablot)
{
if (processor) {
SablotUnregHandler(processor, HLR_MESSAGE, NULL, NULL);