cvs: pear /PECL/session_pgsql session_pgsql.c
| From: | Yasuo Ohgaki | Date: | Thu, 16 Jan 2003 07:33:50 +0000 |
| Subject: | cvs: pear /PECL/session_pgsql session_pgsql.c | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-8283@lists.php.net to get a copy of this message | ||
yohgaki Thu Jan 16 02:33:50 2003 EDT
Modified files:
/pear/PECL/session_pgsql session_pgsql.c
Log:
Fixed zts build
Index: pear/PECL/session_pgsql/session_pgsql.c
diff -u pear/PECL/session_pgsql/session_pgsql.c:1.31 pear/PECL/session_pgsql/session_pgsql.c:1.32
--- pear/PECL/session_pgsql/session_pgsql.c:1.31 Thu Jan 16 02:12:26 2003
+++ pear/PECL/session_pgsql/session_pgsql.c Thu Jan 16 02:33:50 2003
@@ -6,7 +6,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session_pgsql.c,v 1.31 2003/01/16 07:12:26 yohgaki Exp $ */
+/* $Id: session_pgsql.c,v 1.32 2003/01/16 07:33:50 yohgaki Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -167,7 +167,8 @@
smart_str buf={0};
#ifdef ZTS
php_session_pgsql_globals *session_pgsql_globals;
- ts_allocate_id(&session_pgsql_globals_id, sizeof(php_session_pgsql_globals),
php_session_pgsql_init_globals, NULL);
+ ts_allocate_id(&session_pgsql_globals_id, sizeof(php_session_pgsql_globals),
+ (ts_allocate_ctor) php_session_pgsql_init_globals, NULL);
session_pgsql_globals = ts_resource(session_pgsql_globals_id);
#else
php_session_pgsql_init_globals(&session_pgsql_globals TSRMLS_CC);
@@ -527,7 +528,7 @@
int len, id = 0;
if (PS_PGSQL(servers) == 1) {
- db = php_ps_pgsql_connect(0);
+ db = php_ps_pgsql_connect(0 TSRMLS_CC);
PS_PGSQL(current_id) = 0;
return db;
}
@@ -540,7 +541,7 @@
}
tmp = div(sum, PS_PGSQL(servers));
id = tmp.rem;
- db = php_ps_pgsql_connect(id);
+ db = php_ps_pgsql_connect(id TSRMLS_CC);
PS_PGSQL(current_id) = id;
}
if (!db) {
@@ -550,7 +551,7 @@
if (start_id+1 <= PS_PGSQL(servers)) {
for (id = start_id+1; id < PS_PGSQL(servers) && PS_PGSQL(pgsql_link)[id]; id++) {
/* if link is bad, NULL is returned */
- db = php_ps_pgsql_connect(id);
+ db = php_ps_pgsql_connect(id TSRMLS_CC);
if (db) {
PS_PGSQL(current_id) = id;
break;
@@ -559,7 +560,7 @@
}
for (id = 0; id < start_id && PS_PGSQL(pgsql_link)[id]; id++) {
/* if link is bad, NULL is returned */
- db = php_ps_pgsql_connect(id);
+ db = php_ps_pgsql_connect(id TSRMLS_CC);
if (db) {
PS_PGSQL(current_id) = id;
break;
@@ -643,7 +644,7 @@
/* {{{ ps_pgsql_app_write
*/
-static int ps_pgsql_app_write(TSRMLS_DC)
+static int ps_pgsql_app_write(TSRMLS_D)
{
PGconn *pg_link = PS_PGSQL(current_db);
PGresult *pg_result;