Backport patches (#2006)

* Guard SQLITE_BUSY_SNAPSHOT which is not available in older SQLite releases

When building POCO unbundled with older versions of SQLite (such as on RHEL7)
SQLITE_BUSY_SNAPSHOT is not defined, so #ifdef guard it.

* Some of the samples need to link with PocoJSON

* Build parallelization issues #1730

* Fix building XMLStreamParser with unbundled expat
This commit is contained in:
Scott Talbert
2017-11-20 10:31:20 -05:00
committed by Aleksandar Fabijanic
parent 6cdf579b48
commit 1724e8ba53
7 changed files with 11 additions and 5 deletions

View File

@@ -30,7 +30,11 @@
#include "Poco/XML/QName.h"
#include "Poco/XML/ValueTraits.h"
#include "Poco/XML/Content.h"
#if defined(POCO_UNBUNDLED)
#include <expat.h>
#else
#include <Poco/XML/expat.h>
#endif
#include <map>
#include <vector>
#include <string>