From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 23 Apr 2015 00:43:55 +0000 (+0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~177
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=801768f72ceb5682b3bc6c10827f747d93753a58;p=php

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  libpq versions older than 9.3 do not have lo_lseek64
  fix include with vc14
  fix compilation with vc14
  improve zpp readme
---

801768f72ceb5682b3bc6c10827f747d93753a58