cvs: php4 /ext/pgsql/ config.m4 pgsql.c php_pgsql.h

jah Tue May 23 08:03:34 2000 EDT Modified files: /php4/ext/pgsql config.m4 pgsql.c php_pgsql.h Log: According to current PostgreSQL docs, using PQoidStatus() is deprecated. Index: php4/ext/pgsql/config.m4 diff -u php4/ext/pgsql/config.m4:1.11 php4/ext/pgsql/config.m4:1.12 --- php4/ext/pgsql/config.m4:1.11 Tue May 2 06:01:15 2000 +++ php4/ext/pgsql/config.m4 Tue May 23 08:03:34 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.11 2000/05/02 04:01:15 sas Exp $ +dnl $Id: config.m4,v 1.12 2000/05/23 06:03:34 jah Exp $ AC_DEFUN(PGSQL_INC_CHK,[if test -r $i$1/libpq-fe.h; then PGSQL_DIR=$i; PGSQL_INCDIR=$i$1]) @@ -29,6 +29,7 @@ old_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -L$PGSQL_LIBDIR" AC_CHECK_LIB(pq, PQcmdTuples,AC_DEFINE(HAVE_PQCMDTUPLES,1,[ ])) + AC_CHECK_LIB(pq, PQoidValue,AC_DEFINE(HAVE_PQOIDVALUE,1,[ ])) LIBS="$old_LIBS" LDFLAGS="$old_LDFLAGS" Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.46 php4/ext/pgsql/pgsql.c:1.47 --- php4/ext/pgsql/pgsql.c:1.46 Thu May 18 17:34:32 2000 +++ php4/ext/pgsql/pgsql.c Tue May 23 08:03:34 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.46 2000/05/18 15:34:32 zeev Exp $ */ +/* $Id: pgsql.c,v 1.47 2000/05/23 06:03:34 jah Exp $ */ #include <stdlib.h> @@ -1127,6 +1127,7 @@ RETURN_FALSE; } pgsql_result = pg_result->result; +#ifndef HAVE_PQOIDVALUE return_value->value.str.val = (char *) PQoidStatus(pgsql_result); if (return_value->value.str.val) { return_value->value.str.len = strlen(return_value->value.str.val); @@ -1134,7 +1135,15 @@ return_value->type = IS_STRING; } else { return_value->value.str.val = empty_string; - } + } +#else + return_value->value.lval = (int) PQoidValue(pgsql_result); + if (return_value->value.lval == InvalidOid) { + RETURN_FALSE; + } else { + return_value->type = IS_LONG; + } +#endif } /* }}} */ Index: php4/ext/pgsql/php_pgsql.h diff -u php4/ext/pgsql/php_pgsql.h:1.8 php4/ext/pgsql/php_pgsql.h:1.9 --- php4/ext/pgsql/php_pgsql.h:1.8 Tue May 2 07:27:35 2000 +++ php4/ext/pgsql/php_pgsql.h Tue May 23 08:03:34 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pgsql.h,v 1.8 2000/05/02 05:27:35 sas Exp $ */ +/* $Id: php_pgsql.h,v 1.9 2000/05/23 06:03:34 jah Exp $ */ #ifndef _PHP_PGSQL_H #define _PHP_PGSQL_H @@ -43,7 +43,8 @@ #define pgsql_module_ptr &pgsql_module_entry #ifdef PHP_PGSQL_PRIVATE - +#undef SOCKET_SIZE_TYPE +#include <postgres.h> #include <libpq-fe.h> #if (WIN32||WINNT)