abies Wed Aug 6 08:09:31 2003 EDT
Modified files:
/php-src/ext/interbase interbase.c php_interbase.h
Log:
Minor Win32 fixes/cleanups
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.115 php-src/ext/interbase/interbase.c:1.116
--- php-src/ext/interbase/interbase.c:1.115 Tue Aug 5 19:40:30 2003
+++ php-src/ext/interbase/interbase.c Wed Aug 6 08:09:30 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interbase.c,v 1.115 2003/08/05 23:40:30 abies Exp $ */
+/* $Id: interbase.c,v 1.116 2003/08/06 12:09:30 abies Exp $ */
/* TODO: Arrays, roles?
@@ -75,7 +75,8 @@
#endif
#ifdef ZEND_DEBUG
-#define IBDEBUG(a) php_printf("::: %s (%s:%d)\n", a, __FILE__, __LINE__);
+/* #define IBDEBUG(a) php_printf("::: %s (%d)\n", a, __LINE__); */
+#define IBDEBUG(a)
#else
#define IBDEBUG(a)
#endif
@@ -670,7 +671,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "Interbase Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.115 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.116 $");
#ifdef COMPILE_DL_INTERBASE
php_info_print_table_row(2, "Dynamic Module", "yes");
#endif
@@ -1152,8 +1153,8 @@
goto _php_ibase_alloc_query_error;
}
- IB_QUERY->out_sqlda = (XSQLDA *) emalloc(XSQLDA_LENGTH(0));
- IB_QUERY->out_sqlda->sqln = 0;
+ IB_QUERY->out_sqlda = (XSQLDA *) emalloc(XSQLDA_LENGTH(1));
+ IB_QUERY->out_sqlda->sqln = 1;
IB_QUERY->out_sqlda->version = SQLDA_VERSION1;
if (isc_dsql_prepare(IB_STATUS, &IB_QUERY->trans, &IB_QUERY->stmt, 0, query,
dialect, IB_QUERY->out_sqlda)) {
@@ -1173,8 +1174,8 @@
}
/* maybe have input placeholders? */
- IB_QUERY->in_sqlda = emalloc(XSQLDA_LENGTH(0));
- IB_QUERY->in_sqlda->sqln = 0;
+ IB_QUERY->in_sqlda = emalloc(XSQLDA_LENGTH(1));
+ IB_QUERY->in_sqlda->sqln = 1;
IB_QUERY->in_sqlda->version = SQLDA_VERSION1;
if (isc_dsql_describe_bind(IB_STATUS, &IB_QUERY->stmt, SQLDA_VERSION1,
IB_QUERY->in_sqlda)) {
_php_ibase_error(TSRMLS_C);
@@ -1583,7 +1584,7 @@
PHP_FUNCTION(ibase_trans)
{
- unsigned i, argn, link_cnt = 0, tpb_len = 0;
+ unsigned short i, argn, link_cnt = 0, tpb_len = 0;
char last_tpb[TPB_MAX_SIZE];
ibase_db_link **ib_link = NULL;
ibase_trans *ib_trans;
Index: php-src/ext/interbase/php_interbase.h
diff -u php-src/ext/interbase/php_interbase.h:1.36
php-src/ext/interbase/php_interbase.h:1.37
--- php-src/ext/interbase/php_interbase.h:1.36 Tue Aug 5 12:30:47 2003
+++ php-src/ext/interbase/php_interbase.h Wed Aug 6 08:09:30 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_interbase.h,v 1.36 2003/08/05 16:30:47 sniper Exp $ */
+/* $Id: php_interbase.h,v 1.37 2003/08/06 12:09:30 abies Exp $ */
#ifndef PHP_INTERBASE_H
#define PHP_INTERBASE_H
@@ -29,14 +29,10 @@
extern zend_module_entry ibase_module_entry;
#define phpext_interbase_ptr &ibase_module_entry
+#ifndef ISC_INT64_FORMAT
#ifdef PHP_WIN32
-#define PHP_IBASE_API __declspec(dllexport)
-#ifndef ISC_INT64_FORMAT
#define ISC_INT64_FORMAT "I64"
-#endif
#else
-#define PHP_IBASE_API
-#ifndef ISC_INT64_FORMAT
#define ISC_INT64_FORMAT "ll"
#endif
#endif
@@ -162,8 +158,6 @@
short var_len;
char var_str[1];
} IBASE_VCHAR;
-
-/* extern ibase_module php_ibase_module; */
enum php_interbase_option {
PHP_IBASE_DEFAULT = 0,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
