Merged pull request #470

Author: derickr

php_bson.h

@@ -67,14 +67,14 @@ typedef struct {
 #define PHONGO_BSON_STATE_INITIALIZER  { NULL, { PHONGO_TYPEMAP_NONE, NULL, PHONGO_TYPEMAP_NONE, NULL, PHONGO_TYPEMAP_NONE, NULL}, NULL}
 #endif
 
-PHONGO_API void phongo_zval_to_bson(zval *data, php_phongo_bson_flags_t flags, bson_t *bson, bson_t **bson_out TSRMLS_DC);
-PHONGO_API int phongo_bson_to_zval_ex(const unsigned char *data, int data_len, php_phongo_bson_state *state);
+void phongo_zval_to_bson(zval *data, php_phongo_bson_flags_t flags, bson_t *bson, bson_t **bson_out TSRMLS_DC);
+int phongo_bson_to_zval_ex(const unsigned char *data, int data_len, php_phongo_bson_state *state);
 #if PHP_VERSION_ID >= 70000
-PHONGO_API int phongo_bson_to_zval(const unsigned char *data, int data_len, zval *out);
+int phongo_bson_to_zval(const unsigned char *data, int data_len, zval *out);
 #else
-PHONGO_API int phongo_bson_to_zval(const unsigned char *data, int data_len, zval **out);
+int phongo_bson_to_zval(const unsigned char *data, int data_len, zval **out);
 #endif
-PHONGO_API void phongo_bson_typemap_to_state(zval *typemap, php_phongo_bson_typemap *map TSRMLS_DC);
+void phongo_bson_typemap_to_state(zval *typemap, php_phongo_bson_typemap *map TSRMLS_DC);
 
 PHP_FUNCTION(toPHP);
 PHP_FUNCTION(fromPHP);

php_phongo.c

@@ -95,7 +95,7 @@ php_phongo_server_description_type_map[PHONGO_SERVER_DESCRIPTION_TYPES] = {
 /* {{{ phongo_std_object_handlers */
 zend_object_handlers phongo_std_object_handlers;
 
-PHONGO_API zend_object_handlers *phongo_get_std_object_handlers(void)
+zend_object_handlers *phongo_get_std_object_handlers(void)
 {
 	return &phongo_std_object_handlers;
 }

php_phongo.h

@@ -96,8 +96,8 @@ typedef enum {
 	PHONGO_ERROR_LOGIC               = 9
 } php_phongo_error_domain_t;
 
-PHONGO_API zend_class_entry* phongo_exception_from_mongoc_domain(uint32_t /* mongoc_error_domain_t */ domain, uint32_t /* mongoc_error_code_t */ code);
-PHONGO_API zend_class_entry* phongo_exception_from_phongo_domain(php_phongo_error_domain_t domain);
+zend_class_entry* phongo_exception_from_mongoc_domain(uint32_t /* mongoc_error_domain_t */ domain, uint32_t /* mongoc_error_code_t */ code);
+zend_class_entry* phongo_exception_from_phongo_domain(php_phongo_error_domain_t domain);
 void phongo_throw_exception(php_phongo_error_domain_t domain TSRMLS_DC, const char *format, ...)
 #if PHP_VERSION_ID < 70000
 # ifndef PHP_WIN32
@@ -111,7 +111,7 @@ void phongo_throw_exception(php_phongo_error_domain_t domain TSRMLS_DC, const ch
 ;
 void phongo_throw_exception_from_bson_error_t(bson_error_t *error TSRMLS_DC);
 
-PHONGO_API zend_object_handlers *phongo_get_std_object_handlers(void);
+zend_object_handlers *phongo_get_std_object_handlers(void);
 
 void                     phongo_server_init          (zval *return_value, zval *manager, int server_id TSRMLS_DC);
 void                     phongo_readconcern_init     (zval *return_value, const mongoc_read_concern_t *read_concern TSRMLS_DC);

src/bson.c

@@ -1138,7 +1138,7 @@ static bool is_public_property(zend_class_entry *ce, const char *prop_name, int
 }
 /* }}} */
 
-PHONGO_API void phongo_zval_to_bson(zval *data, php_phongo_bson_flags_t flags, bson_t *bson, bson_t **bson_out TSRMLS_DC) /* {{{ */
+void phongo_zval_to_bson(zval *data, php_phongo_bson_flags_t flags, bson_t *bson, bson_t **bson_out TSRMLS_DC) /* {{{ */
 {
 	HashTable   *ht_data = NULL;
 #if PHP_VERSION_ID >= 70000
@@ -1378,9 +1378,9 @@ PHONGO_API void phongo_zval_to_bson(zval *data, php_phongo_bson_flags_t flags, b
 
 /* }}} */
 #if PHP_VERSION_ID >= 70000
-PHONGO_API int phongo_bson_to_zval(const unsigned char *data, int data_len, zval *zv)
+int phongo_bson_to_zval(const unsigned char *data, int data_len, zval *zv)
 #else
-PHONGO_API int phongo_bson_to_zval(const unsigned char *data, int data_len, zval **zv)
+int phongo_bson_to_zval(const unsigned char *data, int data_len, zval **zv)
 #endif
 {
 	int retval = 0;
@@ -1396,7 +1396,7 @@ PHONGO_API int phongo_bson_to_zval(const unsigned char *data, int data_len, zval
 	return retval;
 }
 
-PHONGO_API int phongo_bson_to_zval_ex(const unsigned char *data, int data_len, php_phongo_bson_state *state)
+int phongo_bson_to_zval_ex(const unsigned char *data, int data_len, php_phongo_bson_state *state)
 {
 	      bson_reader_t *reader;
 	      bson_iter_t    iter;
@@ -1552,7 +1552,7 @@ static void apply_classname_to_state(const char *classname, int classname_len, p
 	}
 }
 
-PHONGO_API void phongo_bson_typemap_to_state(zval *typemap, php_phongo_bson_typemap *map TSRMLS_DC)
+void phongo_bson_typemap_to_state(zval *typemap, php_phongo_bson_typemap *map TSRMLS_DC)
 {
 	if (typemap) {
 		char      *classname;