cvs: php4 /ext/pgsql pgsql.c
| From: | Zeev Suraski | Date: | Wed, 11 Oct 2000 18:00:18 +0000 |
| Subject: | cvs: php4 /ext/pgsql pgsql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1999@lists.php.net to get a copy of this message | ||
zeev Wed Oct 11 11:00:18 2000 EDT
Modified files:
/php4/ext/pgsql pgsql.c
Log:
Remove conflict
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.74 php4/ext/pgsql/pgsql.c:1.75
--- php4/ext/pgsql/pgsql.c:1.74 Wed Oct 11 06:27:21 2000
+++ php4/ext/pgsql/pgsql.c Wed Oct 11 11:00:18 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.74 2000/10/11 13:27:21 zeev Exp $ */
+/* $Id: pgsql.c,v 1.75 2000/10/11 18:00:18 zeev Exp $ */
#include <stdlib.h>
@@ -425,12 +425,7 @@
PGG(num_links)++;
}
efree(hashed_details);
-<<<<<<< pgsql.c
php_pgsql_set_default_link(return_value->value.lval);
-=======
- PGG(default_link)=return_value->value.lval;
- zend_list_addref(return_value->value.lval);
->>>>>>> 1.63
}