cvs: php4 /ext/ingres_ii ii.c ii.h php_ii.h /win32 php_modules.dsw

dbeu Mon Nov 13 14:23:15 2000 EDT Modified files: /php4/ext/ingres_ii ii.c ii.h php_ii.h /php4/win32 php_modules.dsw Log: make ingres compile under win32 # no cleanup... Index: php4/ext/ingres_ii/ii.c diff -u php4/ext/ingres_ii/ii.c:1.12 php4/ext/ingres_ii/ii.c:1.13 --- php4/ext/ingres_ii/ii.c:1.12 Wed Oct 25 10:43:52 2000 +++ php4/ext/ingres_ii/ii.c Mon Nov 13 14:23:15 2000 @@ -19,11 +19,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: ii.c,v 1.12 2000/10/25 17:43:52 andrei Exp $ */ +/* $Id: ii.c,v 1.13 2000/11/13 22:23:15 dbeu Exp $ */ #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 @@ 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 _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 @@ 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; Index: php4/ext/ingres_ii/ii.h diff -u php4/ext/ingres_ii/ii.h:1.3 php4/ext/ingres_ii/ii.h:1.4 --- php4/ext/ingres_ii/ii.h:1.3 Fri Sep 29 02:29:02 2000 +++ php4/ext/ingres_ii/ii.h Mon Nov 13 14:23:15 2000 @@ -19,13 +19,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: ii.h,v 1.3 2000/09/29 09:29:02 henot Exp $ */ +/* $Id: ii.h,v 1.4 2000/11/13 22:23:15 dbeu Exp $ */ #ifndef II_H #define II_H #if HAVE_II - +#include "php_ii.h" #include "iiapi.h" typedef struct _II_LINK { @@ -45,8 +45,8 @@ 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); Index: php4/ext/ingres_ii/php_ii.h diff -u php4/ext/ingres_ii/php_ii.h:1.5 php4/ext/ingres_ii/php_ii.h:1.6 --- php4/ext/ingres_ii/php_ii.h:1.5 Sat Aug 26 07:21:25 2000 +++ php4/ext/ingres_ii/php_ii.h Mon Nov 13 14:23:15 2000 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ii.h,v 1.5 2000/08/26 14:21:25 andi Exp $ */ +/* $Id: php_ii.h,v 1.6 2000/11/13 22:23:15 dbeu Exp $ */ #ifndef PHP_II_H #define PHP_II_H @@ -78,12 +78,12 @@ #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 Index: php4/win32/php_modules.dsw diff -u php4/win32/php_modules.dsw:1.32 php4/win32/php_modules.dsw:1.33 --- php4/win32/php_modules.dsw:1.32 Mon Nov 13 12:24:22 2000 +++ php4/win32/php_modules.dsw Mon Nov 13 14:23:15 2000 @@ -207,6 +207,18 @@ ############################################################################### +Project: "ingres"=..\ext\ingres_ii\ingres.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "interbase"=..\ext\interbase\interbase.dsp - Package Owner=<4> Package=<5>