PosgreSQL Fix...

Zeev's fixes to the PostgreSQL code broke PHP compiling with apache. PHP 4.0b4-dev compiles fine standalone (and as module 'till the linking stage to create httpd)... The following changes were made to get it to compile. (The PHP_FE(pg_write, NULL) - change was needed to get php to compile, and unrelated to the php/apache linking errors, btw...) Index: pgsql.c =================================================================== RCS file: /repository/php4/ext/pgsql/pgsql.c,v retrieving revision 1.34 diff -u -r1.34 pgsql.c --- pgsql.c 1999/12/21 05:22:43 1.34 +++ pgsql.c 1999/12/25 04:37:50 @@ -69,7 +69,9 @@ PHP_FE(pg_loopen, NULL) PHP_FE(pg_loclose, NULL) PHP_FE(pg_loread, NULL) +/* Don't know where this is from PHP_FE(pg_write, NULL) + */ PHP_FE(pg_loreadall, NULL) {NULL, NULL, NULL} }; @@ -783,7 +785,7 @@ return_value->type = IS_LONG; break; case PHP_PG_FIELD_TYPE: - return_value->value.str.val = get_field_name(pg_result->conn,PQftype(pgsql_result,field->value.lval),list); + return_value->value.str.val = get_fieldname(pg_result->conn,PQftype(pgsql_result,field->value.lval),list); return_value->value.str.len = strlen(return_value->value.str.val); return_value->type = IS_STRING; break; @@ -794,7 +796,7 @@ /* {{{ proto string pg_fieldname(int result, int field_number) Returns the name of the field */ -PHP_FUNCTION(pg_field_name) +PHP_FUNCTION(pg_fieldname) { php_pgsql_get_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_FIELD_NAME); } -- Dominic J. Eidson "Baruk Khazad! Khazad ai-menu!" - Gimli -------------------------------------------------------------------------------- http://www.the-infinite.org/ http://www.the-infinite.org/~dominic/