com php-src: fix data type and 64-bit compat: ext/pdo_pgsql/p gsql_driver.c
| From: | Anatol Belski | Date: | Wed, 15 Apr 2015 15:57:23 +0000 |
| Subject: | com php-src: fix data type and 64-bit compat: ext/pdo_pgsql/p gsql_driver.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86287@lists.php.net to get a copy of this message | ||
Commit: a01e8c1fe91e73539d9f9d23d8a49e66750ef73d
Author: Anatol Belski <ab@php.net> Wed, 15 Apr 2015 13:44:12 +0200
Parents: c48bf6e55c2abf0b8f3fb359971375821673f776
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a01e8c1fe91e73539d9f9d23d8a49e66750ef73d
Log:
fix data type and 64-bit compat
Changed paths:
M ext/pdo_pgsql/pgsql_driver.c
Diff:
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c
index 20cd706..d758987 100644
--- a/ext/pdo_pgsql/pgsql_driver.c
+++ b/ext/pdo_pgsql/pgsql_driver.c
@@ -155,7 +155,11 @@ static int pgsql_lob_seek(php_stream *stream, zend_off_t offset, int whence,
zend_off_t *newoffset)
{
struct pdo_pgsql_lob_self *self = (struct pdo_pgsql_lob_self*)stream->abstract;
- int pos = lo_lseek(self->conn, self->lfd, offset, whence);
+#if ZEND_ENABLE_ZVAL_LONG64
+ zend_off_t pos = lo_lseek64(self->conn, self->lfd, offset, whence);
+#else
+ zend_off_t pos = lo_lseek(self->conn, self->lfd, offset, whence);
+#endif
*newoffset = pos;
return pos >= 0 ? 0 : -1;
}