PHPC-907: Remove PHONGO_API macro for exported symbols

jmikola · jmikola · commit 064add8f8ea7 · 2017-02-10T15:56:12.000-05:00
diff --git a/php_phongo.h b/php_phongo.h
@@ -29,14 +29,6 @@ extern zend_module_entry mongodb_module_entry;
 #define MONGODB_STABILITY_S "devel"
 #define MONGODB_VERSION   MONGODB_VERSION_S
 
-#ifdef PHP_WIN32
-#	define PHONGO_API __declspec(dllexport)
-#elif defined(__GNUC__) && __GNUC__ >= 4
-#	define PHONGO_API __attribute__ ((visibility("default")))
-#else
-#	define PHONGO_API
-#endif
-
 ZEND_BEGIN_MODULE_GLOBALS(mongodb)
 	char *debug;
 	FILE *debug_fd;
diff --git a/php_phongo_classes.h b/php_phongo_classes.h
@@ -194,47 +194,47 @@ typedef struct {
 } php_phongo_cursor_iterator;
 
 
-extern PHONGO_API zend_class_entry *php_phongo_command_ce;
-extern PHONGO_API zend_class_entry *php_phongo_cursor_ce;
-extern PHONGO_API zend_class_entry *php_phongo_cursorid_ce;
-extern PHONGO_API zend_class_entry *php_phongo_manager_ce;
-extern PHONGO_API zend_class_entry *php_phongo_query_ce;
-extern PHONGO_API zend_class_entry *php_phongo_readconcern_ce;
-extern PHONGO_API zend_class_entry *php_phongo_readpreference_ce;
-extern PHONGO_API zend_class_entry *php_phongo_result_ce;
-extern PHONGO_API zend_class_entry *php_phongo_server_ce;
-extern PHONGO_API zend_class_entry *php_phongo_bulkwrite_ce;
-extern PHONGO_API zend_class_entry *php_phongo_writeconcern_ce;
-extern PHONGO_API zend_class_entry *php_phongo_writeconcernerror_ce;
-extern PHONGO_API zend_class_entry *php_phongo_writeerror_ce;
-extern PHONGO_API zend_class_entry *php_phongo_writeresult_ce;
+extern zend_class_entry *php_phongo_command_ce;
+extern zend_class_entry *php_phongo_cursor_ce;
+extern zend_class_entry *php_phongo_cursorid_ce;
+extern zend_class_entry *php_phongo_manager_ce;
+extern zend_class_entry *php_phongo_query_ce;
+extern zend_class_entry *php_phongo_readconcern_ce;
+extern zend_class_entry *php_phongo_readpreference_ce;
+extern zend_class_entry *php_phongo_result_ce;
+extern zend_class_entry *php_phongo_server_ce;
+extern zend_class_entry *php_phongo_bulkwrite_ce;
+extern zend_class_entry *php_phongo_writeconcern_ce;
+extern zend_class_entry *php_phongo_writeconcernerror_ce;
+extern zend_class_entry *php_phongo_writeerror_ce;
+extern zend_class_entry *php_phongo_writeresult_ce;
 
-extern PHONGO_API zend_class_entry *php_phongo_exception_ce;
-extern PHONGO_API zend_class_entry *php_phongo_logicexception_ce;
-extern PHONGO_API zend_class_entry *php_phongo_runtimeexception_ce;
-extern PHONGO_API zend_class_entry *php_phongo_unexpectedvalueexception_ce;
-extern PHONGO_API zend_class_entry *php_phongo_invalidargumentexception_ce;
-extern PHONGO_API zend_class_entry *php_phongo_connectionexception_ce;
-extern PHONGO_API zend_class_entry *php_phongo_authenticationexception_ce;
-extern PHONGO_API zend_class_entry *php_phongo_sslconnectionexception_ce;
-extern PHONGO_API zend_class_entry *php_phongo_executiontimeoutexception_ce;
-extern PHONGO_API zend_class_entry *php_phongo_connectiontimeoutexception_ce;
-extern PHONGO_API zend_class_entry *php_phongo_writeexception_ce;
-extern PHONGO_API zend_class_entry *php_phongo_bulkwriteexception_ce;
+extern zend_class_entry *php_phongo_exception_ce;
+extern zend_class_entry *php_phongo_logicexception_ce;
+extern zend_class_entry *php_phongo_runtimeexception_ce;
+extern zend_class_entry *php_phongo_unexpectedvalueexception_ce;
+extern zend_class_entry *php_phongo_invalidargumentexception_ce;
+extern zend_class_entry *php_phongo_connectionexception_ce;
+extern zend_class_entry *php_phongo_authenticationexception_ce;
+extern zend_class_entry *php_phongo_sslconnectionexception_ce;
+extern zend_class_entry *php_phongo_executiontimeoutexception_ce;
+extern zend_class_entry *php_phongo_connectiontimeoutexception_ce;
+extern zend_class_entry *php_phongo_writeexception_ce;
+extern zend_class_entry *php_phongo_bulkwriteexception_ce;
 
-extern PHONGO_API zend_class_entry *php_phongo_type_ce;
-extern PHONGO_API zend_class_entry *php_phongo_persistable_ce;
-extern PHONGO_API zend_class_entry *php_phongo_unserializable_ce;
-extern PHONGO_API zend_class_entry *php_phongo_serializable_ce;
-extern PHONGO_API zend_class_entry *php_phongo_binary_ce;
-extern PHONGO_API zend_class_entry *php_phongo_decimal128_ce;
-extern PHONGO_API zend_class_entry *php_phongo_javascript_ce;
-extern PHONGO_API zend_class_entry *php_phongo_maxkey_ce;
-extern PHONGO_API zend_class_entry *php_phongo_minkey_ce;
-extern PHONGO_API zend_class_entry *php_phongo_objectid_ce;
-extern PHONGO_API zend_class_entry *php_phongo_regex_ce;
-extern PHONGO_API zend_class_entry *php_phongo_timestamp_ce;
-extern PHONGO_API zend_class_entry *php_phongo_utcdatetime_ce;
+extern zend_class_entry *php_phongo_type_ce;
+extern zend_class_entry *php_phongo_persistable_ce;
+extern zend_class_entry *php_phongo_unserializable_ce;
+extern zend_class_entry *php_phongo_serializable_ce;
+extern zend_class_entry *php_phongo_binary_ce;
+extern zend_class_entry *php_phongo_decimal128_ce;
+extern zend_class_entry *php_phongo_javascript_ce;
+extern zend_class_entry *php_phongo_maxkey_ce;
+extern zend_class_entry *php_phongo_minkey_ce;
+extern zend_class_entry *php_phongo_objectid_ce;
+extern zend_class_entry *php_phongo_regex_ce;
+extern zend_class_entry *php_phongo_timestamp_ce;
+extern zend_class_entry *php_phongo_utcdatetime_ce;
 
 /* Shared across all MongoDB\Driver objects to disable unserialize() */
 PHP_METHOD(Manager, __wakeup);
diff --git a/src/BSON/Binary.c b/src/BSON/Binary.c
@@ -44,7 +44,7 @@
 #include "php_bson.h"
 
 
-PHONGO_API zend_class_entry *php_phongo_binary_ce;
+zend_class_entry *php_phongo_binary_ce;
 
 zend_object_handlers php_phongo_handler_binary;
 
diff --git a/src/BSON/Decimal128.c b/src/BSON/Decimal128.c
@@ -42,7 +42,7 @@
 #include "php_bson.h"
 
 
-PHONGO_API zend_class_entry *php_phongo_decimal128_ce;
+zend_class_entry *php_phongo_decimal128_ce;
 
 zend_object_handlers php_phongo_handler_decimal128;
 
diff --git a/src/BSON/Javascript.c b/src/BSON/Javascript.c
@@ -42,7 +42,7 @@
 #include "php_bson.h"
 
 
-PHONGO_API zend_class_entry *php_phongo_javascript_ce;
+zend_class_entry *php_phongo_javascript_ce;
 
 zend_object_handlers php_phongo_handler_javascript;
 
diff --git a/src/BSON/MaxKey.c b/src/BSON/MaxKey.c
@@ -36,7 +36,7 @@
 #include "php_bson.h"
 
 
-PHONGO_API zend_class_entry *php_phongo_maxkey_ce;
+zend_class_entry *php_phongo_maxkey_ce;
 
 zend_object_handlers php_phongo_handler_maxkey;
 
diff --git a/src/BSON/MinKey.c b/src/BSON/MinKey.c
@@ -36,7 +36,7 @@
 #include "php_bson.h"
 
 
-PHONGO_API zend_class_entry *php_phongo_minkey_ce;
+zend_class_entry *php_phongo_minkey_ce;
 
 zend_object_handlers php_phongo_handler_minkey;
 
diff --git a/src/BSON/ObjectID.c b/src/BSON/ObjectID.c
@@ -42,7 +42,7 @@
 #include "php_bson.h"
 
 
-PHONGO_API zend_class_entry *php_phongo_objectid_ce;
+zend_class_entry *php_phongo_objectid_ce;
 
 zend_object_handlers php_phongo_handler_objectid;
 
diff --git a/src/BSON/Persistable.c b/src/BSON/Persistable.c
@@ -36,7 +36,7 @@
 #include "php_bson.h"
 
 
-PHONGO_API zend_class_entry *php_phongo_persistable_ce;
+zend_class_entry *php_phongo_persistable_ce;
 
 
 
diff --git a/src/BSON/Regex.c b/src/BSON/Regex.c
@@ -42,7 +42,7 @@
 #include "php_bson.h"
 
 
-PHONGO_API zend_class_entry *php_phongo_regex_ce;
+zend_class_entry *php_phongo_regex_ce;
 
 zend_object_handlers php_phongo_handler_regex;
 
diff --git a/src/BSON/Serializable.c b/src/BSON/Serializable.c
@@ -36,7 +36,7 @@
 #include "php_bson.h"
 
 
-PHONGO_API zend_class_entry *php_phongo_serializable_ce;
+zend_class_entry *php_phongo_serializable_ce;
 
 
 
diff --git a/src/BSON/Timestamp.c b/src/BSON/Timestamp.c
@@ -42,7 +42,7 @@
 #include "php_bson.h"
 
 
-PHONGO_API zend_class_entry *php_phongo_timestamp_ce;
+zend_class_entry *php_phongo_timestamp_ce;
 
 zend_object_handlers php_phongo_handler_timestamp;
 
diff --git a/src/BSON/Type.c b/src/BSON/Type.c
@@ -36,7 +36,7 @@
 #include "php_bson.h"
 
 
-PHONGO_API zend_class_entry *php_phongo_type_ce;
+zend_class_entry *php_phongo_type_ce;
 
 
 
diff --git a/src/BSON/UTCDateTime.c b/src/BSON/UTCDateTime.c
@@ -48,7 +48,7 @@
 #include "php_bson.h"
 
 
-PHONGO_API zend_class_entry *php_phongo_utcdatetime_ce;
+zend_class_entry *php_phongo_utcdatetime_ce;
 
 zend_object_handlers php_phongo_handler_utcdatetime;
 
diff --git a/src/BSON/Unserializable.c b/src/BSON/Unserializable.c
@@ -36,7 +36,7 @@
 #include "php_bson.h"
 
 
-PHONGO_API zend_class_entry *php_phongo_unserializable_ce;
+zend_class_entry *php_phongo_unserializable_ce;
 
 
 
diff --git a/src/MongoDB/BulkWrite.c b/src/MongoDB/BulkWrite.c
@@ -39,7 +39,7 @@
 
 #define BYPASS_UNSET -1
 
-PHONGO_API zend_class_entry *php_phongo_bulkwrite_ce;
+zend_class_entry *php_phongo_bulkwrite_ce;
 
 zend_object_handlers php_phongo_handler_bulkwrite;
 
diff --git a/src/MongoDB/Command.c b/src/MongoDB/Command.c
@@ -36,7 +36,7 @@
 #include "php_bson.h"
 
 
-PHONGO_API zend_class_entry *php_phongo_command_ce;
+zend_class_entry *php_phongo_command_ce;
 
 zend_object_handlers php_phongo_handler_command;
 
diff --git a/src/MongoDB/Cursor.c b/src/MongoDB/Cursor.c
@@ -36,7 +36,7 @@
 #include "php_bson.h"
 
 
-PHONGO_API zend_class_entry *php_phongo_cursor_ce;
+zend_class_entry *php_phongo_cursor_ce;
 
 zend_object_handlers php_phongo_handler_cursor;
 
diff --git a/src/MongoDB/CursorId.c b/src/MongoDB/CursorId.c
@@ -36,7 +36,7 @@
 #include "php_bson.h"
 
 
-PHONGO_API zend_class_entry *php_phongo_cursorid_ce;
+zend_class_entry *php_phongo_cursorid_ce;
 
 zend_object_handlers php_phongo_handler_cursorid;
 
diff --git a/src/MongoDB/Exception/AuthenticationException.c b/src/MongoDB/Exception/AuthenticationException.c
@@ -37,7 +37,7 @@
 #include <ext/spl/spl_exceptions.h>
 
 
-PHONGO_API zend_class_entry *php_phongo_authenticationexception_ce;
+zend_class_entry *php_phongo_authenticationexception_ce;
 
 /* {{{ MongoDB\Driver\AuthenticationException */
 
diff --git a/src/MongoDB/Exception/BulkWriteException.c b/src/MongoDB/Exception/BulkWriteException.c
@@ -37,7 +37,7 @@
 #include <ext/spl/spl_exceptions.h>
 
 
-PHONGO_API zend_class_entry *php_phongo_bulkwriteexception_ce;
+zend_class_entry *php_phongo_bulkwriteexception_ce;
 
 /* {{{ MongoDB\Driver\BulkWriteException */
 
diff --git a/src/MongoDB/Exception/ConnectionException.c b/src/MongoDB/Exception/ConnectionException.c
@@ -37,7 +37,7 @@
 #include <ext/spl/spl_exceptions.h>
 
 
-PHONGO_API zend_class_entry *php_phongo_connectionexception_ce;
+zend_class_entry *php_phongo_connectionexception_ce;
 
 /* {{{ MongoDB\Driver\ConnectionException */
 
diff --git a/src/MongoDB/Exception/ConnectionTimeoutException.c b/src/MongoDB/Exception/ConnectionTimeoutException.c
@@ -37,7 +37,7 @@
 #include <ext/spl/spl_exceptions.h>
 
 
-PHONGO_API zend_class_entry *php_phongo_connectiontimeoutexception_ce;
+zend_class_entry *php_phongo_connectiontimeoutexception_ce;
 
 /* {{{ MongoDB\Driver\ConnectionTimeoutException */
 
diff --git a/src/MongoDB/Exception/Exception.c b/src/MongoDB/Exception/Exception.c
@@ -37,7 +37,7 @@
 #include <ext/spl/spl_exceptions.h>
 
 
-PHONGO_API zend_class_entry *php_phongo_exception_ce;
+zend_class_entry *php_phongo_exception_ce;
 
 /* {{{ MongoDB\Driver\Exception */
 
diff --git a/src/MongoDB/Exception/ExecutionTimeoutException.c b/src/MongoDB/Exception/ExecutionTimeoutException.c
@@ -37,7 +37,7 @@
 #include <ext/spl/spl_exceptions.h>
 
 
-PHONGO_API zend_class_entry *php_phongo_executiontimeoutexception_ce;
+zend_class_entry *php_phongo_executiontimeoutexception_ce;
 
 /* {{{ MongoDB\Driver\ExecutionTimeoutException */
 
diff --git a/src/MongoDB/Exception/InvalidArgumentException.c b/src/MongoDB/Exception/InvalidArgumentException.c
@@ -37,7 +37,7 @@
 #include <ext/spl/spl_exceptions.h>
 
 
-PHONGO_API zend_class_entry *php_phongo_invalidargumentexception_ce;
+zend_class_entry *php_phongo_invalidargumentexception_ce;
 
 /* {{{ MongoDB\Driver\InvalidArgumentException */
 
diff --git a/src/MongoDB/Exception/LogicException.c b/src/MongoDB/Exception/LogicException.c
@@ -37,7 +37,7 @@
 #include <ext/spl/spl_exceptions.h>
 
 
-PHONGO_API zend_class_entry *php_phongo_logicexception_ce;
+zend_class_entry *php_phongo_logicexception_ce;
 
 /* {{{ MongoDB\Driver\LogicException */
 
diff --git a/src/MongoDB/Exception/RuntimeException.c b/src/MongoDB/Exception/RuntimeException.c
@@ -37,7 +37,7 @@
 #include <ext/spl/spl_exceptions.h>
 
 
-PHONGO_API zend_class_entry *php_phongo_runtimeexception_ce;
+zend_class_entry *php_phongo_runtimeexception_ce;
 
 /* {{{ MongoDB\Driver\RuntimeException */
 
diff --git a/src/MongoDB/Exception/SSLConnectionException.c b/src/MongoDB/Exception/SSLConnectionException.c
@@ -37,7 +37,7 @@
 #include <ext/spl/spl_exceptions.h>
 
 
-PHONGO_API zend_class_entry *php_phongo_sslconnectionexception_ce;
+zend_class_entry *php_phongo_sslconnectionexception_ce;
 
 /* {{{ MongoDB\Driver\SSLConnectionException */
 
diff --git a/src/MongoDB/Exception/UnexpectedValueException.c b/src/MongoDB/Exception/UnexpectedValueException.c
@@ -37,7 +37,7 @@
 #include <ext/spl/spl_exceptions.h>
 
 
-PHONGO_API zend_class_entry *php_phongo_unexpectedvalueexception_ce;
+zend_class_entry *php_phongo_unexpectedvalueexception_ce;
 
 /* {{{ MongoDB\Driver\UnexpectedValueException */
 
diff --git a/src/MongoDB/Exception/WriteException.c b/src/MongoDB/Exception/WriteException.c
@@ -37,7 +37,7 @@
 #include <ext/spl/spl_exceptions.h>
 
 
-PHONGO_API zend_class_entry *php_phongo_writeexception_ce;
+zend_class_entry *php_phongo_writeexception_ce;
 
 /* {{{ proto MongoDB\Driver\WriteResult WriteException::getWriteResult()
    Returns the WriteResult from the failed write operation. */
diff --git a/src/MongoDB/Manager.c b/src/MongoDB/Manager.c
@@ -41,7 +41,7 @@
 
 #define PHONGO_MANAGER_URI_DEFAULT "mongodb://127.0.0.1/"
 
-PHONGO_API zend_class_entry *php_phongo_manager_ce;
+zend_class_entry *php_phongo_manager_ce;
 
 zend_object_handlers php_phongo_handler_manager;
 
diff --git a/src/MongoDB/Query.c b/src/MongoDB/Query.c
@@ -40,7 +40,7 @@
 #include "php_bson.h"
 
 
-PHONGO_API zend_class_entry *php_phongo_query_ce;
+zend_class_entry *php_phongo_query_ce;
 
 zend_object_handlers php_phongo_handler_query;
 
diff --git a/src/MongoDB/ReadConcern.c b/src/MongoDB/ReadConcern.c
@@ -36,7 +36,7 @@
 #include "php_bson.h"
 
 
-PHONGO_API zend_class_entry *php_phongo_readconcern_ce;
+zend_class_entry *php_phongo_readconcern_ce;
 
 zend_object_handlers php_phongo_handler_readconcern;
 
diff --git a/src/MongoDB/ReadPreference.c b/src/MongoDB/ReadPreference.c
@@ -38,7 +38,7 @@
 #include "php_bson.h"
 
 
-PHONGO_API zend_class_entry *php_phongo_readpreference_ce;
+zend_class_entry *php_phongo_readpreference_ce;
 
 zend_object_handlers php_phongo_handler_readpreference;
 
diff --git a/src/MongoDB/Server.c b/src/MongoDB/Server.c
diff --git a/src/MongoDB/WriteConcern.c b/src/MongoDB/WriteConcern.c
diff --git a/src/MongoDB/WriteConcernError.c b/src/MongoDB/WriteConcernError.c
diff --git a/src/MongoDB/WriteError.c b/src/MongoDB/WriteError.c
diff --git a/src/MongoDB/WriteResult.c b/src/MongoDB/WriteResult.c

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`#include "php_bson.h"`
`37`	`37`
`38`	`38`
`39`		`-PHONGO_API zend_class_entry *php_phongo_persistable_ce;`
	`39`	`+zend_class_entry *php_phongo_persistable_ce;`
`40`	`40`
`41`	`41`
`42`	`42`