diff options
| author | Zeev Suraski <zeev@php.net> | 1999-12-17 20:55:31 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-12-17 20:55:31 +0000 |
| commit | fb1c77bd4f8a636ba47d720f8ca65fc6baae836d (patch) | |
| tree | 1be0390e76d422f7abc36f577178f9683536fa84 /ext/fdf | |
| parent | 71dddd7db7e768ae8145e085fcbb6b6db4a1c40a (diff) | |
| download | php-git-fb1c77bd4f8a636ba47d720f8ca65fc6baae836d.tar.gz | |
- Made PHP_VERSION and PHP_OS work again
- More php3_ cleanup
@- Restored the PHP_VERSION and PHP_OS constants (Zeev)
Diffstat (limited to 'ext/fdf')
| -rw-r--r-- | ext/fdf/fdf.c | 6 | ||||
| -rw-r--r-- | ext/fdf/php_fdf.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/fdf/fdf.c b/ext/fdf/fdf.c index accd795b9d..6b40b5cf74 100644 --- a/ext/fdf/fdf.c +++ b/ext/fdf/fdf.c @@ -80,14 +80,14 @@ function_entry fdf_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry fdf_module_entry = { +zend_module_entry fdf_module_entry = { "fdf", fdf_functions, PHP_MINIT(fdf), PHP_MSHUTDOWN(fdf), NULL, NULL, PHP_MINFO(fdf), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL #include "dl/phpdl.h" -DLEXPORT php3_module_entry *get_module(void) { return &fdf_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &fdf_module_entry; } #endif static void phpi_FDFClose(FDFDoc fdf) { @@ -548,7 +548,7 @@ PHP_FUNCTION(fdf_add_template) { id=(*arg1)->value.lval; fdf = zend_list_find(id,&type); if(!fdf || type!=FDF_GLOBAL(le_fdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } diff --git a/ext/fdf/php_fdf.h b/ext/fdf/php_fdf.h index ab2256c5fe..cef900dc01 100644 --- a/ext/fdf/php_fdf.h +++ b/ext/fdf/php_fdf.h @@ -39,7 +39,7 @@ #include <FdfTk.h> -extern php3_module_entry fdf_module_entry; +extern zend_module_entry fdf_module_entry; #define phpext_fdf_ptr &fdf_module_entry extern PHP_MINIT_FUNCTION(fdf); |