generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-14 23:07:56 +02:00
Code Issues Projects Releases Wiki Activity

GH #321: trivial build fixes (BB QNX build)

Browse Source
This commit is contained in:
Alex Fabijanic
2014-04-30 22:58:28 -05:00
parent 68044fdae0
commit f9057157e8
7 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -61,6 +61,7 @@ Release 1.5.3 (2014-05-xx)
- fixed GH #346: Make Poco::Data::Date and Poco::Data::Time compare functions const. - fixed GH #346: Make Poco::Data::Date and Poco::Data::Time compare functions const.
- fixed GH #341: Compiling poco-1.5.2 for Cygwin - fixed GH #341: Compiling poco-1.5.2 for Cygwin
- fixed GH #305: There are bugs in Buffer.h - fixed GH #305: There are bugs in Buffer.h
- fixed GH #321: trivial build fixes (BB QNX build)
Release 1.5.2 (2013-09-16) Release 1.5.2 (2013-09-16)
========================== ==========================

4
Foundation/include/Poco/FileStream.h
View File

@@ -42,9 +42,9 @@
#include "Poco/Foundation.h" #include "Poco/Foundation.h"
#if defined(POCO_OS_FAMILY_WINDOWS) #if defined(POCO_OS_FAMILY_WINDOWS)
#include "FileStream_WIN32.h" #include "Poco/FileStream_WIN32.h"
#else #else
#include "FileStream_POSIX.h" #include "Poco/FileStream_POSIX.h"
#endif #endif
#include <istream> #include <istream>
#include <ostream> #include <ostream>

8
Foundation/include/Poco/Platform_POSIX.h
View File

@@ -109,4 +109,12 @@
#endif // __GNUC__ #endif // __GNUC__
//
// No syslog.h on QNX/BB10
//
#if defined(__QNXNTO__)
#define POCO_NO_SYSLOGCHANNEL
#endif
#endif // Foundation_Platform_POSIX_INCLUDED #endif // Foundation_Platform_POSIX_INCLUDED

2
Foundation/include/Poco/UnicodeConverter.h
View File

@@ -129,7 +129,7 @@ public:
} }
template <typename T> template <typename T>
static size_t UTFStrlen(const T* ptr) static std::size_t UTFStrlen(const T* ptr)
/// Returns the length (in characters) of a zero-terminated UTF string. /// Returns the length (in characters) of a zero-terminated UTF string.
{ {
if (ptr == 0) return 0; if (ptr == 0) return 0;

2
Foundation/src/LoggingFactory.cpp
View File

@@ -42,7 +42,7 @@
#include "Poco/FormattingChannel.h" #include "Poco/FormattingChannel.h"
#include "Poco/SplitterChannel.h" #include "Poco/SplitterChannel.h"
#include "Poco/NullChannel.h" #include "Poco/NullChannel.h"
#if defined(POCO_OS_FAMILY_UNIX) #if defined(POCO_OS_FAMILY_UNIX) && !defined(POCO_NO_SYSLOGCHANNEL)
#include "Poco/SyslogChannel.h" #include "Poco/SyslogChannel.h"
#endif #endif
#if defined(POCO_OS_FAMILY_VMS) #if defined(POCO_OS_FAMILY_VMS)

1
Foundation/src/RegularExpression.cpp
View File

@@ -40,6 +40,7 @@
#if defined(POCO_UNBUNDLED) #if defined(POCO_UNBUNDLED)
#include <pcre.h> #include <pcre.h>
#else #else
#include "pcre_config.h"
#include "pcre.h" #include "pcre.h"
#endif #endif

4
Foundation/src/UnicodeConverter.cpp
View File

@@ -78,7 +78,7 @@ void UnicodeConverter::convert(const char* utf8String, std::size_t length, UTF32
void UnicodeConverter::convert(const char* utf8String, UTF32String& utf32String) void UnicodeConverter::convert(const char* utf8String, UTF32String& utf32String)
{ {
if (!utf8String || !strlen(utf8String)) if (!utf8String || !std::strlen(utf8String))
{ {
utf32String.clear(); utf32String.clear();
return; return;
@@ -125,7 +125,7 @@ void UnicodeConverter::convert(const char* utf8String, std::size_t length, UTF1
void UnicodeConverter::convert(const char* utf8String, UTF16String& utf16String) void UnicodeConverter::convert(const char* utf8String, UTF16String& utf16String)
{ {
if (!utf8String || !strlen(utf8String)) if (!utf8String || !std::strlen(utf8String))
{ {
utf16String.clear(); utf16String.clear();
return; return;