From c0d060f5c02db168f1de895b41afffbc6e3cacfb Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 3 Jan 2014 11:04:26 +0800 Subject: Bump year --- ext/interbase/php_ibase_includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/interbase/php_ibase_includes.h') diff --git a/ext/interbase/php_ibase_includes.h b/ext/interbase/php_ibase_includes.h index 559be77a44..71990a5e4b 100644 --- a/ext/interbase/php_ibase_includes.h +++ b/ext/interbase/php_ibase_includes.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | -- cgit v1.2.1 From 1c3ed86211c25eb8f11330b5214d4e03672115ab Mon Sep 17 00:00:00 2001 From: Popa Adrian Marius Date: Thu, 10 Apr 2014 17:42:32 +0300 Subject: Cleanup $ is not needed for git --- ext/interbase/php_ibase_includes.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'ext/interbase/php_ibase_includes.h') diff --git a/ext/interbase/php_ibase_includes.h b/ext/interbase/php_ibase_includes.h index 71990a5e4b..c994a92da5 100644 --- a/ext/interbase/php_ibase_includes.h +++ b/ext/interbase/php_ibase_includes.h @@ -18,8 +18,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #ifndef PHP_IBASE_INCLUDES_H #define PHP_IBASE_INCLUDES_H -- cgit v1.2.1 From 0d5121a3c7e499cb27c7d5aa14d5e6ad62ecde34 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 5 May 2014 00:50:51 +0200 Subject: fixed ZEND_DEBUG usage --- ext/interbase/php_ibase_includes.h | 1 + 1 file changed, 1 insertion(+) (limited to 'ext/interbase/php_ibase_includes.h') diff --git a/ext/interbase/php_ibase_includes.h b/ext/interbase/php_ibase_includes.h index c994a92da5..6671c9162d 100644 --- a/ext/interbase/php_ibase_includes.h +++ b/ext/interbase/php_ibase_includes.h @@ -35,6 +35,7 @@ #define IB_STATUS (IBG(status)) +/* XXX ZEND_DEBUG_ is misleading, it should be something like IBASE_DEBUG. */ #ifdef ZEND_DEBUG_ #define IBDEBUG(a) php_printf("::: %s (%d)\n", a, __LINE__); #endif -- cgit v1.2.1 From 21dec5f511f8d3c5973e921d468359ad459545f5 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 29 Jul 2014 10:15:01 +0400 Subject: ext/interbase support (incomplete) --- ext/interbase/php_ibase_includes.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ext/interbase/php_ibase_includes.h') diff --git a/ext/interbase/php_ibase_includes.h b/ext/interbase/php_ibase_includes.h index 6671c9162d..72eb0702a6 100644 --- a/ext/interbase/php_ibase_includes.h +++ b/ext/interbase/php_ibase_includes.h @@ -101,7 +101,7 @@ typedef struct event { unsigned short event_count; char **events; char *event_buffer, *result_buffer; - zval *callback; + zval callback; void **thread_ctx; struct event *event_next; enum event_state { NEW, ACTIVE, DEAD } state; @@ -155,17 +155,17 @@ void _php_ibase_module_error(char * TSRMLS_DC, ...) PHP_ATTRIBUTE_FORMAT(printf,1,PHP_ATTR_FMT_OFFSET +2); /* determine if a resource is a link or transaction handle */ -#define PHP_IBASE_LINK_TRANS(pzval, lh, th) \ - do { if (!pzval) { \ +#define PHP_IBASE_LINK_TRANS(zv, lh, th) \ + do { if (!zv) { \ ZEND_FETCH_RESOURCE2(lh, ibase_db_link *, NULL, IBG(default_link), \ "InterBase link", le_link, le_plink) } \ else \ - _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU, &pzval, &lh, &th); \ + _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU, zv, &lh, &th); \ if (SUCCESS != _php_ibase_def_trans(lh, &th TSRMLS_CC)) { RETURN_FALSE; } \ } while (0) int _php_ibase_def_trans(ibase_db_link *ib_link, ibase_trans **trans TSRMLS_DC); -void _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAMETERS, zval **link_id, +void _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAMETERS, zval *link_id, ibase_db_link **ib_link, ibase_trans **trans); /* provided by ibase_query.c */ @@ -176,7 +176,7 @@ void php_ibase_blobs_minit(INIT_FUNC_ARGS); int _php_ibase_string_to_quad(char const *id, ISC_QUAD *qd); char *_php_ibase_quad_to_string(ISC_QUAD const qd); int _php_ibase_blob_get(zval *return_value, ibase_blob *ib_blob, unsigned long max_len TSRMLS_DC); -int _php_ibase_blob_add(zval **string_arg, ibase_blob *ib_blob TSRMLS_DC); +int _php_ibase_blob_add(zval *string_arg, ibase_blob *ib_blob TSRMLS_DC); /* provided by ibase_events.c */ void php_ibase_events_minit(INIT_FUNC_ARGS); -- cgit v1.2.1 From 59286f89f7def7571daa5cfe559c740286b92bf7 Mon Sep 17 00:00:00 2001 From: Popa Adrian Marius Date: Thu, 28 Aug 2014 17:10:42 +0300 Subject: solve conflicting type size_t vs int --- ext/interbase/php_ibase_includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/interbase/php_ibase_includes.h') diff --git a/ext/interbase/php_ibase_includes.h b/ext/interbase/php_ibase_includes.h index 72eb0702a6..d1dc5510a3 100644 --- a/ext/interbase/php_ibase_includes.h +++ b/ext/interbase/php_ibase_includes.h @@ -44,7 +44,7 @@ #define IBDEBUG(a) #endif -extern int le_link, le_plink, le_trans; +extern size_t le_link, le_plink, le_trans; #define LE_LINK "Firebird/InterBase link" #define LE_PLINK "Firebird/InterBase persistent link" -- cgit v1.2.1 From e41754b7d8d757684a312d3c22d161becaa1df9a Mon Sep 17 00:00:00 2001 From: Popa Adrian Marius Date: Thu, 28 Aug 2014 18:20:28 +0300 Subject: rename misleading define --- ext/interbase/php_ibase_includes.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'ext/interbase/php_ibase_includes.h') diff --git a/ext/interbase/php_ibase_includes.h b/ext/interbase/php_ibase_includes.h index d1dc5510a3..4219913fc1 100644 --- a/ext/interbase/php_ibase_includes.h +++ b/ext/interbase/php_ibase_includes.h @@ -35,8 +35,7 @@ #define IB_STATUS (IBG(status)) -/* XXX ZEND_DEBUG_ is misleading, it should be something like IBASE_DEBUG. */ -#ifdef ZEND_DEBUG_ +#ifdef IBASE_DEBUG #define IBDEBUG(a) php_printf("::: %s (%d)\n", a, __LINE__); #endif -- cgit v1.2.1 From b2d2b965b2ddb2e013a15a8858420f18614562a9 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 29 Aug 2014 11:28:21 +0800 Subject: resource type is int --- ext/interbase/php_ibase_includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/interbase/php_ibase_includes.h') diff --git a/ext/interbase/php_ibase_includes.h b/ext/interbase/php_ibase_includes.h index 4219913fc1..a51f44c034 100644 --- a/ext/interbase/php_ibase_includes.h +++ b/ext/interbase/php_ibase_includes.h @@ -43,7 +43,7 @@ #define IBDEBUG(a) #endif -extern size_t le_link, le_plink, le_trans; +extern int le_link, le_plink, le_trans; #define LE_LINK "Firebird/InterBase link" #define LE_PLINK "Firebird/InterBase persistent link" -- cgit v1.2.1 From d0cb715373c3fbe9dc095378ec5ed8c71f799f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= Date: Fri, 19 Sep 2014 18:33:14 +0200 Subject: s/PHP 5/PHP 7/ --- ext/interbase/php_ibase_includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/interbase/php_ibase_includes.h') diff --git a/ext/interbase/php_ibase_includes.h b/ext/interbase/php_ibase_includes.h index a51f44c034..8e80505c17 100644 --- a/ext/interbase/php_ibase_includes.h +++ b/ext/interbase/php_ibase_includes.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ -- cgit v1.2.1