generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-03-03 21:06:25 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1 from pocoproject/develop

Browse Source 
merge
This commit is contained in:
Christopher Baker 2014-08-22 10:02:33 -05:00
commit 564ce03fb9
15 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG
View File

@ -1,5 +1,12 @@
This is the changelog file for the POCO C++ Libraries.
Release 1.6.0 (2014-10-??)
==========================
- fixed GH #326: compile Net lib 1.5.2 without UTF8 support enabled
- fixed GH #518: NetworkInterface.cpp compile error w/ POCO_NO_WSTRING (1.5.3)
Release 1.5.3 (2014-06-30)
==========================

1
CONTRIBUTORS
View File

@ -44,6 +44,7 @@ Iyed Bennour
Scott Davis
Kristin Cowalcijk
Yuval Kashtan
Christopher Baker
--
$Id$

2
Data/MySQL/include/Poco/Data/MySQL/Connector.h
View File

@ -91,7 +91,7 @@ struct MySQL_API MySQLConnectorRegistrator
#if !defined(POCO_NO_AUTOMATIC_LIB_INIT)
#if defined(POCO_OS_FAMILY_WINDOWS)
#if defined(POCO_OS_FAMILY_WINDOWS) && !defined(__GNUC__)
extern "C" const struct MySQL_API MySQLConnectorRegistrator pocoMySQLConnectorRegistrator;
#if defined(MySQL_EXPORTS)
#if defined(_WIN64)

2
Data/ODBC/include/Poco/Data/ODBC/Connector.h
View File

@ -102,7 +102,7 @@ struct ODBC_API ODBCConnectorRegistrator
#if !defined(POCO_NO_AUTOMATIC_LIB_INIT)
#if defined(POCO_OS_FAMILY_WINDOWS)
#if defined(POCO_OS_FAMILY_WINDOWS) && !defined(__GNUC__)
extern "C" const struct ODBC_API ODBCConnectorRegistrator pocoODBCConnectorRegistrator;
#if defined(ODBC_EXPORTS)
#if defined(_WIN64)

2
Data/SQLite/include/Poco/Data/SQLite/Connector.h
View File

@ -110,7 +110,7 @@ struct SQLite_API SQLiteConnectorRegistrator
#if !defined(POCO_NO_AUTOMATIC_LIB_INIT)
#if defined(POCO_OS_FAMILY_WINDOWS)
#if defined(POCO_OS_FAMILY_WINDOWS) && !defined(__GNUC__)
extern "C" const struct SQLite_API SQLiteConnectorRegistrator pocoSQLiteConnectorRegistrator;
#if defined(SQLite_EXPORTS)
#if defined(_WIN64) || defined(_WIN32_WCE)

4
Foundation/Makefile
View File

@ -59,4 +59,8 @@ target = PocoFoundation
target_version = $(LIBVERSION)
target_libs =
ifeq ($(findstring MinGW, $(POCO_CONFIG)), MinGW)
$(shell cd src; windmc pocomsg.mc)
endif
include $(POCO_BASE)/build/rules/lib

2
Foundation/src/Windows1250Encoding.cpp
View File

@ -23,7 +23,9 @@ namespace Poco {
const char* Windows1250Encoding::_names[] =
{
"windows-1250",
"Windows-1250",
"cp1250",
"CP1250",
NULL
};

3
Foundation/src/Windows1251Encoding.cpp
View File

@ -23,7 +23,9 @@ namespace Poco {
const char* Windows1251Encoding::_names[] =
{
"windows-1251",
"Windows-1251",
"cp1251",
"CP1251",
NULL
};
@ -212,6 +214,7 @@ int Windows1251Encoding::convert(int ch, unsigned char* bytes, int length) const
case 0x044c: if (bytes && length >= 1) *bytes = 0xfc; return 1;
case 0x044d: if (bytes && length >= 1) *bytes = 0xfd; return 1;
case 0x044e: if (bytes && length >= 1) *bytes = 0xfe; return 1;
case 0x044f: if (bytes && length >= 1) *bytes = 0xff; return 1;
default: return 0;
}
}

2
Foundation/src/Windows1252Encoding.cpp
View File

@ -24,7 +24,9 @@ namespace Poco {
const char* Windows1252Encoding::_names[] =
{
"windows-1252",
"Windows-1252",
"cp1252",
"CP1252",
NULL
};

4
Foundation/src/utils.h
View File

@ -53,8 +53,8 @@
// disabled.)
// On Linux,x86 89255e-22 != Div_double(89255.0/1e22)
#if defined(_M_X64) || defined(__x86_64__) || \
defined(__ARMEL__) || defined(_M_ARM) || defined(__arm__) || \
defined(__avr32__) || \
defined(__ARMEL__) || defined(_M_ARM) || defined(__arm__) || defined(__arm64__) || \
defined(__avr32__) || \
defined(__hppa__) || defined(__ia64__) || \
defined(__mips__) || defined(__powerpc__) || \
defined(__sparc__) || defined(__sparc) || defined(__s390__) || \

12
Foundation/testsuite/src/TextEncodingTest.cpp
View File

@ -51,13 +51,13 @@ void TextEncodingTest::testTextEncoding()
assert (std::string("ISO-8859-15") == latin9.canonicalName());
TextEncoding& cp1250 = TextEncoding::byName("CP1250");
assert (std::string("Windows-1250") == cp1250.canonicalName());
assert (std::string("windows-1250") == cp1250.canonicalName());
TextEncoding& cp1251 = TextEncoding::byName("CP1251");
assert (std::string("Windows-1251") == cp1251.canonicalName());
assert (std::string("windows-1251") == cp1251.canonicalName());
TextEncoding& cp1252 = TextEncoding::byName("CP1252");
assert (std::string("Windows-1252") == cp1252.canonicalName());
assert (std::string("windows-1252") == cp1252.canonicalName());
TextEncoding& glob = TextEncoding::global();
@ -77,15 +77,15 @@ void TextEncodingTest::testTextEncoding()
TextEncoding::global(new Windows1250Encoding);
TextEncoding& glob5 = TextEncoding::global();
assert (std::string("Windows-1250") == glob5.canonicalName());
assert (std::string("windows-1250") == glob5.canonicalName());
TextEncoding::global(new Windows1251Encoding);
TextEncoding& glob6 = TextEncoding::global();
assert (std::string("Windows-1251") == glob6.canonicalName());
assert (std::string("windows-1251") == glob6.canonicalName());
TextEncoding::global(new Windows1252Encoding);
TextEncoding& glob7 = TextEncoding::global();
assert (std::string("Windows-1252") == glob7.canonicalName());
assert (std::string("windows-1252") == glob7.canonicalName());
TextEncoding::global(new UTF8Encoding);
TextEncoding& glob8 = TextEncoding::global();

2
Net/Makefile
View File

@ -11,7 +11,7 @@ include $(POCO_BASE)/build/rules/global
SHAREDOPT_CXX += -DNet_EXPORTS
objects = \
DNS HTTPResponse HostEntry Socket \
Net DNS HTTPResponse HostEntry Socket \
DatagramSocket HTTPServer IPAddress IPAddressImpl SocketAddress SocketAddressImpl \
HTTPBasicCredentials HTTPCookie HTMLForm MediaType DialogSocket \
DatagramSocketImpl FilePartSource HTTPServerConnection MessageHeader \

6
Net/include/Poco/Net/Net.h
View File

@ -73,12 +73,12 @@ namespace Poco {
namespace Net {
inline void Net_API initializeNetwork();
void Net_API initializeNetwork();
/// Initialize the network subsystem.
/// (Windows only, no-op elsewhere)
inline void Net_API uninitializeNetwork();
void Net_API uninitializeNetwork();
/// Uninitialize the network subsystem.
/// (Windows only, no-op elsewhere)
@ -90,7 +90,7 @@ inline void Net_API uninitializeNetwork();
// Automate network initialization (only relevant on Windows).
//
#if defined(POCO_OS_FAMILY_WINDOWS) && !defined(POCO_NO_AUTOMATIC_LIB_INIT)
#if defined(POCO_OS_FAMILY_WINDOWS) && !defined(POCO_NO_AUTOMATIC_LIB_INIT) && !defined(__GNUC__)
extern "C" const struct Net_API NetworkInitializer pocoNetworkInitializer;

6
Net/src/NetworkInterface.cpp
View File

@ -28,8 +28,8 @@
#if defined(POCO_OS_FAMILY_WINDOWS)
#if defined(POCO_WIN32_UTF8)
#include "Poco/UnicodeConverter.h"
#include "Poco/Error.h"
#endif
#include "Poco/Error.h"
#include <iphlpapi.h>
#include <ipifcons.h>
#endif
@ -1105,10 +1105,10 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
Poco::UnicodeConverter::toUTF8(pAddress->Description, displayName);
#else
char nameBuffer[1024];
rc = WideCharToMultiByte(CP_ACP, 0, pAddress->FriendlyName, -1, nameBuffer, sizeof(nameBuffer), NULL, NULL);
int rc = WideCharToMultiByte(CP_ACP, 0, pAddress->FriendlyName, -1, nameBuffer, sizeof(nameBuffer), NULL, NULL);
if (rc) name = nameBuffer;
char displayNameBuffer[1024];
int rc = WideCharToMultiByte(CP_ACP, 0, pAddress->Description, -1, displayNameBuffer, sizeof(displayNameBuffer), NULL, NULL);
rc = WideCharToMultiByte(CP_ACP, 0, pAddress->Description, -1, displayNameBuffer, sizeof(displayNameBuffer), NULL, NULL);
if (rc) displayName = displayNameBuffer;
#endif

8
build/config/MinGW
View File

@ -3,7 +3,7 @@
#
# MinGW32
#
# Make settings for MinGW on WinXP
# Make settings for MinGW32
#
#
@ -11,7 +11,7 @@
#
LINKMODE = STATIC
POCO_TARGET_OSNAME = MinGW
POCO_TARGET_OSARCH = ia32
POCO_TARGET_OSARCH = i686
#
# Define Tools
@ -66,9 +66,9 @@ RELEASEOPT_LINK = -O2
#
# System Specific Flags
#
SYSFLAGS = -D_WIN32 -DMINGW32 -DWINVER=0x500 -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC -DPOCO_THREAD_STACK_SIZE -DFoundation_Config_INCLUDED -I/usr/local/include -I/usr/include
SYSFLAGS = -D_WIN32 -DMINGW32 -DWINVER=0x501 -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC -DPOCO_THREAD_STACK_SIZE -I/usr/local/include -I/usr/include
#
# System Specific Libraries
#
SYSLIBS = -L/usr/local/lib -L/usr/lib -liphlpapi -lws2_32 -lssl -lcrypto -lws2_32 -lgdi32
SYSLIBS = -L/usr/local/lib -L/usr/lib -liphlpapi -lssl -lcrypto -lws2_32