cvs: php4 /ext/pgsql pgsql.c /main main.c php.h

dbeu Mon Apr 30 07:23:41 2001 EDT Modified files: /php4/ext/pgsql pgsql.c /php4/main main.c php.h Log: make pgsql build under win32 again Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.99 php4/ext/pgsql/pgsql.c:1.100 --- php4/ext/pgsql/pgsql.c:1.99 Sun Apr 29 10:33:11 2001 +++ php4/ext/pgsql/pgsql.c Mon Apr 30 07:23:40 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.99 2001/04/29 17:33:11 zeev Exp $ */ +/* $Id: pgsql.c,v 1.100 2001/04/30 14:23:40 dbeu Exp $ */ #include <stdlib.h> @@ -162,6 +162,7 @@ static int _rollback_transactions(zend_rsrc_list_entry *rsrc) { PGconn *link = (PGconn *)rsrc->ptr; + PGLS_FETCH(); PGG(ignore_notices) = 1; PQexec(link,"BEGIN;ROLLBACK;"); Index: php4/main/main.c diff -u php4/main/main.c:1.362 php4/main/main.c:1.363 --- php4/main/main.c:1.362 Mon Apr 30 05:43:40 2001 +++ php4/main/main.c Mon Apr 30 07:23:41 2001 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.362 2001/04/30 12:43:40 andi Exp $ */ +/* $Id: main.c,v 1.363 2001/04/30 14:23:41 dbeu Exp $ */ #include <stdio.h> @@ -251,7 +251,7 @@ /* True global (no need for thread safety */ static int module_initialized = 0; -void php_log_err(char *log_message) +PHPAPI void php_log_err(char *log_message) { FILE *log_file; char error_time_str[128]; Index: php4/main/php.h diff -u php4/main/php.h:1.136 php4/main/php.h:1.137 --- php4/main/php.h:1.136 Fri Apr 27 09:41:53 2001 +++ php4/main/php.h Mon Apr 30 07:23:41 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.136 2001/04/27 16:41:53 dbeu Exp $ */ +/* $Id: php.h,v 1.137 2001/04/30 14:23:41 dbeu Exp $ */ #ifndef PHP_H #define PHP_H @@ -241,7 +241,7 @@ void phperror(char *error); PHPAPI int php_write(void *buf, uint size); PHPAPI int php_printf(const char *format, ...); -void php_log_err(char *log_message); +PHPAPI void php_log_err(char *log_message); int Debug(char *format, ...); int cfgparse(void);