diff options
| author | Daniel Beulshausen <dbeu@php.net> | 2000-11-13 22:23:16 +0000 |
|---|---|---|
| committer | Daniel Beulshausen <dbeu@php.net> | 2000-11-13 22:23:16 +0000 |
| commit | 0c3d96c3ba51f70bde1c518a3983346ebfa8ca40 (patch) | |
| tree | 863ae2cadf8ba31c1adc84c243d0bce20d64dff2 /ext/ingres_ii | |
| parent | c1e1bc07ff8807d6af0f197bb2c6b8aeeb68c8ca (diff) | |
| download | php-git-0c3d96c3ba51f70bde1c518a3983346ebfa8ca40.tar.gz | |
make ingres compile under win32
# no cleanup...
Diffstat (limited to 'ext/ingres_ii')
| -rw-r--r-- | ext/ingres_ii/ii.c | 13 | ||||
| -rw-r--r-- | ext/ingres_ii/ii.h | 6 | ||||
| -rw-r--r-- | ext/ingres_ii/php_ii.h | 4 |
3 files changed, 12 insertions, 11 deletions
diff --git a/ext/ingres_ii/ii.c b/ext/ingres_ii/ii.c index 9d0402bef6..48dc87300a 100644 --- a/ext/ingres_ii/ii.c +++ b/ext/ingres_ii/ii.c @@ -24,6 +24,7 @@ #include "php.h" #include "php_globals.h" #include "php_ini.h" +#include "ext/standard/info.h" #include "php_ii.h" #include "ii.h" #include "ext/standard/php_string.h" @@ -43,7 +44,7 @@ function_entry ii_functions[] = { PHP_FE(ingres_connect, NULL) PHP_FE(ingres_pconnect, NULL) PHP_FE(ingres_close, NULL) - PHP_FE(ingres_query, NULL) + PHP_FE(ingres_query, NULL) PHP_FE(ingres_num_rows, NULL) PHP_FE(ingres_num_fields, NULL) PHP_FE(ingres_field_name, NULL) @@ -174,10 +175,10 @@ static void php_close_ii_link(zend_rsrc_list_entry *rsrc) static void _close_ii_plink(zend_rsrc_list_entry *rsrc) { II_LINK *link = (II_LINK *)rsrc->ptr; - IILS_FETCH(); - - close_ii_link(link); - IIG(num_persistent)--; + IILS_FETCH(); + + close_ii_link(link); + IIG(num_persistent)--; } /* cleans up the given persistent link. @@ -257,7 +258,7 @@ PHP_MINIT_FUNCTION(ii) REGISTER_INI_ENTRIES(); le_ii_link = zend_register_list_destructors_ex(php_close_ii_link, NULL, "ingres", module_number); - le_ii_plink = zend_register_list_destructors_ex(_clean_ii_plink, php_close_ii_plink, "ingres persistent", module_number); + le_ii_plink = zend_register_list_destructors_ex(_clean_ii_plink, _close_ii_plink, "ingres persistent", module_number); IIG(num_persistent) = 0; diff --git a/ext/ingres_ii/ii.h b/ext/ingres_ii/ii.h index 059fa33f30..8258dd46e0 100644 --- a/ext/ingres_ii/ii.h +++ b/ext/ingres_ii/ii.h @@ -25,7 +25,7 @@ #define II_H #if HAVE_II - +#include "php_ii.h" #include "iiapi.h" typedef struct _II_LINK { @@ -45,8 +45,8 @@ static int ii_success(IIAPI_GENPARM *genParm); static int _close_statement(II_LINK *link); static int _rollback_transaction(II_LINK *link); static void _close_ii_link(II_LINK *link); -static void _close_ii_plink(II_LINK *link); -static void _clean_ii_plink(II_LINK *link); +static void _close_ii_plink(zend_rsrc_list_entry *link); +static void _clean_ii_plink(zend_rsrc_list_entry *link); static int php_ii_get_default_link(INTERNAL_FUNCTION_PARAMETERS IILS_DC); static void php_ii_set_default_link(int id); static void php_ii_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent); diff --git a/ext/ingres_ii/php_ii.h b/ext/ingres_ii/php_ii.h index a5a1731f90..eb7a8c0fc0 100644 --- a/ext/ingres_ii/php_ii.h +++ b/ext/ingres_ii/php_ii.h @@ -78,12 +78,12 @@ ZEND_END_MODULE_GLOBALS(ii) #define II_BOTH (II_ASSOC|II_NUM) #ifdef ZTS -#define IILS_D php_ii_globals *ii_globals +#define IILS_D zend_ii_globals *ii_globals #define IILS_DC , IILS_D #define IILS_C ii_globals #define IILS_CC , IILS_C #define IIG(v) (ii_globals->v) -#define IILS_FETCH() php_ii_globals *ii_globals = ts_resource(ii_globals_id) +#define IILS_FETCH() zend_ii_globals *ii_globals = ts_resource(ii_globals_id) #else #define IILS_D #define IILS_DC |