GH56: Need a way to disable *_API macros with GCC

GH #56: Need a way to disable *_API macros with GCC
2013-01-13 10:31:21 -06:00 · 2013-01-13 10:31:21 -06:00 · 76a7e2e716
--- a/Crypto/include/Poco/Crypto/Crypto.h
+++ b/Crypto/include/Poco/Crypto/Crypto.h
@ -90,7 +90,7 @@ enum RSAPaddingMode


 #if !defined(Crypto_API)
-	#if defined (__GNUC__) && (__GNUC__ >= 4)
+	#if !defined(POCO_NO_GCC_API_ATTRIBUTE) && defined (__GNUC__) && (__GNUC__ >= 4)
 		#define Crypto_API __attribute__ ((visibility ("default")))
 	#else
 		#define Crypto_API
--- a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h
@ -61,7 +61,7 @@


 #if !defined(MySQL_API)
-	#if defined (__GNUC__) && (__GNUC__ >= 4)
+	#if !defined(POCO_NO_GCC_API_ATTRIBUTE) && defined (__GNUC__) && (__GNUC__ >= 4)
 		#define MySQL_API __attribute__ ((visibility ("default")))
 	#else
 		#define MySQL_API
--- a/Data/ODBC/include/Poco/Data/ODBC/ODBC.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/ODBC.h
@ -66,7 +66,7 @@


 #if !defined(ODBC_API)
-	#if defined (__GNUC__) && (__GNUC__ >= 4)
+	#if !defined(POCO_NO_GCC_API_ATTRIBUTE) && defined (__GNUC__) && (__GNUC__ >= 4)
 		#define ODBC_API __attribute__ ((visibility ("default")))
 	#else
 		#define ODBC_API
--- a/Data/SQLite/include/Poco/Data/SQLite/SQLite.h
+++ b/Data/SQLite/include/Poco/Data/SQLite/SQLite.h
@ -63,7 +63,7 @@


 #if !defined(SQLite_API)
-	#if defined (__GNUC__) && (__GNUC__ >= 4)
+	#if !defined(POCO_NO_GCC_API_ATTRIBUTE) && defined (__GNUC__) && (__GNUC__ >= 4)
 		#define SQLite_API __attribute__ ((visibility ("default")))
 	#else
 		#define SQLite_API
--- a/Data/include/Poco/Data/Data.h
+++ b/Data/include/Poco/Data/Data.h
@ -63,7 +63,7 @@


 #if !defined(Data_API)
-	#if defined (__GNUC__) && (__GNUC__ >= 4)
+	#if !defined(POCO_NO_GCC_API_ATTRIBUTE) && defined (__GNUC__) && (__GNUC__ >= 4)
 		#define Data_API __attribute__ ((visibility ("default")))
 	#else
 		#define Data_API
--- a/Foundation/include/Poco/Foundation.h
+++ b/Foundation/include/Poco/Foundation.h
@ -76,7 +76,7 @@


 #if !defined(Foundation_API)
-	#if defined (__GNUC__) && (__GNUC__ >= 4)
+	#if !defined(POCO_NO_GCC_API_ATTRIBUTE) && defined (__GNUC__) && (__GNUC__ >= 4)
 		#define Foundation_API __attribute__ ((visibility ("default")))
 	#else
 		#define Foundation_API
--- a/JSON/include/Poco/JSON/JSON.h
+++ b/JSON/include/Poco/JSON/JSON.h
@ -63,7 +63,7 @@


 #if !defined(JSON_API)
-	#if defined (__GNUC__) && (__GNUC__ >= 4)
+	#if !defined(POCO_NO_GCC_API_ATTRIBUTE) && defined (__GNUC__) && (__GNUC__ >= 4)
 		#define JSON_API __attribute__ ((visibility ("default")))
 	#else
 		#define JSON_API
--- a/Net/include/Poco/Net/Net.h
+++ b/Net/include/Poco/Net/Net.h
@ -63,7 +63,7 @@


 #if !defined(Net_API)
-	#if defined (__GNUC__) && (__GNUC__ >= 4)
+	#if !defined(POCO_NO_GCC_API_ATTRIBUTE) && defined (__GNUC__) && (__GNUC__ >= 4)
 		#define Net_API __attribute__ ((visibility ("default")))
 	#else
 		#define Net_API
--- a/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h
+++ b/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h
@ -63,7 +63,7 @@


 #if !defined(NetSSL_API)
-	#if defined (__GNUC__) && (__GNUC__ >= 4)
+	#if !defined(POCO_NO_GCC_API_ATTRIBUTE) && defined (__GNUC__) && (__GNUC__ >= 4)
 		#define NetSSL_API __attribute__ ((visibility ("default")))
 	#else
 		#define NetSSL_API
--- a/PocoDoc/cfg/mkdoc-poco.xml
+++ b/PocoDoc/cfg/mkdoc-poco.xml
@ -35,18 +35,7 @@
 				-D_DEBUG,
 				-E,
 				-C,
-				-DFoundation_API=,
-				-DXML_API=,
-				-DJSON_API=,
-				-DUtil_API=,
-				-DNet_API=,
-				-DCrypto_API=,
-				-DNetSSL_API=,
-				-DZip_API=,
-				-DData_API=,
-				-DSQLite_API=,
-				-DMySQL_API=,
-				-DODBC_API=
+				-DPOCO_NO_GCC_API_ATTRIBUTE
 			</options>
 			<path></path>
 			<usePipe>true</usePipe>
--- a/PocoDoc/cfg/mkdocumentation.xml
+++ b/PocoDoc/cfg/mkdocumentation.xml
@ -37,18 +37,7 @@
 				-D_DEBUG,
 				-E,
 				-C,
-				-DFoundation_API=,
-				-DXML_API=,
-				-DJSON_API=,
-				-DUtil_API=,
-				-DNet_API=,
-				-DCrypto_API=,
-				-DNetSSL_API=,
-				-DZip_API=,
-				-DData_API=,
-				-DSQLite_API=,
-				-DMySQL_API=,
-				-DODBC_API=
+				-DPOCO_NO_GCC_API_ATTRIBUTE
 			</options>
 			<path></path>
 			<usePipe>true</usePipe>
--- a/Util/include/Poco/Util/Util.h
+++ b/Util/include/Poco/Util/Util.h
@ -63,7 +63,7 @@


 #if !defined(Util_API)
-	#if defined (__GNUC__) && (__GNUC__ >= 4)
+	#if !defined(POCO_NO_GCC_API_ATTRIBUTE) && defined (__GNUC__) && (__GNUC__ >= 4)
 		#define Util_API __attribute__ ((visibility ("default")))
 	#else
 		#define Util_API
--- a/XML/include/Poco/XML/XML.h
+++ b/XML/include/Poco/XML/XML.h
@ -63,7 +63,7 @@


 #if !defined(XML_API)
-	#if defined (__GNUC__) && (__GNUC__ >= 4)
+	#if !defined(POCO_NO_GCC_API_ATTRIBUTE) && defined (__GNUC__) && (__GNUC__ >= 4)
 		#define XML_API __attribute__ ((visibility ("default")))
 	#else
 		#define XML_API
--- a/Zip/include/Poco/Zip/Zip.h
+++ b/Zip/include/Poco/Zip/Zip.h
@ -63,7 +63,7 @@


 #if !defined(Zip_API)
-	#if defined (__GNUC__) && (__GNUC__ >= 4)
+	#if !defined(POCO_NO_GCC_API_ATTRIBUTE) && defined (__GNUC__) && (__GNUC__ >= 4)
 		#define Zip_API __attribute__ ((visibility ("default")))
 	#else
 		#define Zip_API