From e469e4fc62163db69385a2cfadcb00dfb4ed1196 Mon Sep 17 00:00:00 2001 From: Christopher Baker Date: Thu, 21 Aug 2014 14:27:51 -0500 Subject: [PATCH] Fix static init exceptions for MinGW*. --- Data/MySQL/include/Poco/Data/MySQL/Connector.h | 2 +- Data/ODBC/include/Poco/Data/ODBC/Connector.h | 2 +- Data/SQLite/include/Poco/Data/SQLite/Connector.h | 2 +- Net/include/Poco/Net/Net.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Data/MySQL/include/Poco/Data/MySQL/Connector.h b/Data/MySQL/include/Poco/Data/MySQL/Connector.h index 6ac80106a..be7a50cd6 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/Connector.h +++ b/Data/MySQL/include/Poco/Data/MySQL/Connector.h @@ -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) diff --git a/Data/ODBC/include/Poco/Data/ODBC/Connector.h b/Data/ODBC/include/Poco/Data/ODBC/Connector.h index 71b336af5..a8bc736b6 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Connector.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Connector.h @@ -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) diff --git a/Data/SQLite/include/Poco/Data/SQLite/Connector.h b/Data/SQLite/include/Poco/Data/SQLite/Connector.h index ce1fbc3bb..45c7cb03d 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/Connector.h +++ b/Data/SQLite/include/Poco/Data/SQLite/Connector.h @@ -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) diff --git a/Net/include/Poco/Net/Net.h b/Net/include/Poco/Net/Net.h index a7e90564b..cde84564e 100644 --- a/Net/include/Poco/Net/Net.h +++ b/Net/include/Poco/Net/Net.h @@ -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;