generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-13 10:32:57 +01:00
Code Issues Projects Releases Wiki Activity

Backport patches (#2006)

Browse Source 
* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Data/SQLite/src/Utility.cpp
View File

@ -167,7 +167,9 @@ void Utility::throwException(int rc, const std::string& addErrMsg)
throw ExecutionAbortedException(std::string("Callback routine requested an abort"), addErrMsg);
case SQLITE_BUSY:
case SQLITE_BUSY_RECOVERY:
#if defined(SQLITE_BUSY_SNAPSHOT)
case SQLITE_BUSY_SNAPSHOT:
#endif
throw DBLockedException(std::string("The database file is locked"), addErrMsg);
case SQLITE_LOCKED:
throw TableLockedException(std::string("A table in the database is locked"), addErrMsg);

2
Makefile
View File

@ -234,7 +234,7 @@ Data-libexec: Foundation-libexec
Data-tests: Data-libexec cppunit
$(MAKE) -C $(POCO_BASE)/Data/testsuite
Data-samples: Data-libexec Data-libexec Data/SQLite-libexec
Data-samples: Data-libexec Data-libexec Data/SQLite-libexec Net-libexec
$(MAKE) -C $(POCO_BASE)/Data/samples
Data-clean:

2
Net/samples/Mail/Makefile
View File

@ -10,6 +10,6 @@ objects = Mail
target = Mail
target_version = 1
target_libs = PocoUtil PocoNet PocoXML PocoFoundation
target_libs = PocoUtil PocoNet PocoXML PocoJSON PocoFoundation
include $(POCO_BASE)/build/rules/exec

2
Net/samples/dict/Makefile
View File

@ -10,6 +10,6 @@ objects = dict
target = dict
target_version = 1
target_libs = PocoUtil PocoNet PocoJSON PocoXML PocoFoundation
target_libs = PocoUtil PocoNet PocoXML PocoJSON PocoFoundation
include $(POCO_BASE)/build/rules/exec

2
Net/samples/download/Makefile
View File

@ -10,6 +10,6 @@ objects = download
target = download
target_version = 1
target_libs = PocoUtil PocoNet PocoXML PocoFoundation
target_libs = PocoUtil PocoNet PocoXML PocoJSON PocoFoundation
include $(POCO_BASE)/build/rules/exec

2
Net/samples/httpget/Makefile
View File

@ -10,6 +10,6 @@ objects = httpget
target = httpget
target_version = 1
target_libs = PocoUtil PocoNet PocoXML PocoFoundation
target_libs = PocoUtil PocoNet PocoXML PocoJSON PocoFoundation
include $(POCO_BASE)/build/rules/exec

4
XML/include/Poco/XML/XMLStreamParser.h
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>