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/oci8 | |
| 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/oci8')
| -rw-r--r-- | ext/oci8/oci8.c | 8 | ||||
| -rw-r--r-- | ext/oci8/php_oci8.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index f94e4a70a1..cc3e2dfdfa 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -92,7 +92,7 @@ PHP_OCI_API php_oci_globals oci_globals; /* {{{ dynamically loadable module stuff */ #if COMPILE_DL -DLEXPORT php3_module_entry *get_module() { return &oci_module_entry; }; +DLEXPORT zend_module_entry *get_module() { return &oci_module_entry; }; #endif /* COMPILE_DL */ /* }}} */ @@ -259,7 +259,7 @@ static zend_function_entry php_oci_lob_class_functions[] = { {NULL,NULL,NULL} }; -php3_module_entry oci8_module_entry = { +zend_module_entry oci8_module_entry = { "Oracle-OCI8", /* extension name */ php_oci_functions, /* extension function list */ PHP_MINIT(oci), /* extension-wide startup function */ @@ -2441,7 +2441,7 @@ PHP_FUNCTION(ocisavelob) if (offparam == -1) { offset = curloblen; } else if (offparam >= curloblen) { - php3_error(E_WARNING, "Offset smaller than current LOB-Size - appending"); + php_error(E_WARNING, "Offset smaller than current LOB-Size - appending"); offset = curloblen; } else { offset = offparam; @@ -2455,7 +2455,7 @@ PHP_FUNCTION(ocisavelob) loblen = (*arg)->value.str.len; if (loblen < 1) { - php3_error(E_WARNING, "Cannot save a lob wich size is less than 1 byte"); + php_error(E_WARNING, "Cannot save a lob wich size is less than 1 byte"); RETURN_FALSE; } diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h index d495aa66fa..51377c5ee2 100644 --- a/ext/oci8/php_oci8.h +++ b/ext/oci8/php_oci8.h @@ -171,7 +171,7 @@ typedef struct { OCIEnv *pEnv; } php_oci_globals; -extern php3_module_entry oci8_module_entry; +extern zend_module_entry oci8_module_entry; #define phpext_oci8_ptr &oci8_module_entry #define OCI_MAX_NAME_LEN 64 |