Skip to content

Commit c50d63d

Browse files
committed
PHPC-533: Remove PHONGO_API macro for exported functions
1 parent c70a2d8 commit c50d63d

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

php_bson.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,14 @@ typedef struct {
6767
#define PHONGO_BSON_STATE_INITIALIZER { NULL, { PHONGO_TYPEMAP_NONE, NULL, PHONGO_TYPEMAP_NONE, NULL, PHONGO_TYPEMAP_NONE, NULL}, NULL}
6868
#endif
6969

70-
PHONGO_API void phongo_zval_to_bson(zval *data, php_phongo_bson_flags_t flags, bson_t *bson, bson_t **bson_out TSRMLS_DC);
71-
PHONGO_API int phongo_bson_to_zval_ex(const unsigned char *data, int data_len, php_phongo_bson_state *state);
70+
void phongo_zval_to_bson(zval *data, php_phongo_bson_flags_t flags, bson_t *bson, bson_t **bson_out TSRMLS_DC);
71+
int phongo_bson_to_zval_ex(const unsigned char *data, int data_len, php_phongo_bson_state *state);
7272
#if PHP_VERSION_ID >= 70000
73-
PHONGO_API int phongo_bson_to_zval(const unsigned char *data, int data_len, zval *out);
73+
int phongo_bson_to_zval(const unsigned char *data, int data_len, zval *out);
7474
#else
75-
PHONGO_API int phongo_bson_to_zval(const unsigned char *data, int data_len, zval **out);
75+
int phongo_bson_to_zval(const unsigned char *data, int data_len, zval **out);
7676
#endif
77-
PHONGO_API void phongo_bson_typemap_to_state(zval *typemap, php_phongo_bson_typemap *map TSRMLS_DC);
77+
void phongo_bson_typemap_to_state(zval *typemap, php_phongo_bson_typemap *map TSRMLS_DC);
7878

7979
PHP_FUNCTION(toPHP);
8080
PHP_FUNCTION(fromPHP);

php_phongo.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ php_phongo_server_description_type_map[PHONGO_SERVER_DESCRIPTION_TYPES] = {
9595
/* {{{ phongo_std_object_handlers */
9696
zend_object_handlers phongo_std_object_handlers;
9797

98-
PHONGO_API zend_object_handlers *phongo_get_std_object_handlers(void)
98+
zend_object_handlers *phongo_get_std_object_handlers(void)
9999
{
100100
return &phongo_std_object_handlers;
101101
}

php_phongo.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ typedef enum {
9696
PHONGO_ERROR_LOGIC = 9
9797
} php_phongo_error_domain_t;
9898

99-
PHONGO_API zend_class_entry* phongo_exception_from_mongoc_domain(uint32_t /* mongoc_error_domain_t */ domain, uint32_t /* mongoc_error_code_t */ code);
100-
PHONGO_API zend_class_entry* phongo_exception_from_phongo_domain(php_phongo_error_domain_t domain);
99+
zend_class_entry* phongo_exception_from_mongoc_domain(uint32_t /* mongoc_error_domain_t */ domain, uint32_t /* mongoc_error_code_t */ code);
100+
zend_class_entry* phongo_exception_from_phongo_domain(php_phongo_error_domain_t domain);
101101
void phongo_throw_exception(php_phongo_error_domain_t domain TSRMLS_DC, const char *format, ...)
102102
#if PHP_VERSION_ID < 70000
103103
# ifndef PHP_WIN32
@@ -111,7 +111,7 @@ void phongo_throw_exception(php_phongo_error_domain_t domain TSRMLS_DC, const ch
111111
;
112112
void phongo_throw_exception_from_bson_error_t(bson_error_t *error TSRMLS_DC);
113113

114-
PHONGO_API zend_object_handlers *phongo_get_std_object_handlers(void);
114+
zend_object_handlers *phongo_get_std_object_handlers(void);
115115

116116
void phongo_server_init (zval *return_value, zval *manager, int server_id TSRMLS_DC);
117117
void phongo_readconcern_init (zval *return_value, const mongoc_read_concern_t *read_concern TSRMLS_DC);

src/bson.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,7 @@ static bool is_public_property(zend_class_entry *ce, const char *prop_name, int
11381138
}
11391139
/* }}} */
11401140

1141-
PHONGO_API void phongo_zval_to_bson(zval *data, php_phongo_bson_flags_t flags, bson_t *bson, bson_t **bson_out TSRMLS_DC) /* {{{ */
1141+
void phongo_zval_to_bson(zval *data, php_phongo_bson_flags_t flags, bson_t *bson, bson_t **bson_out TSRMLS_DC) /* {{{ */
11421142
{
11431143
HashTable *ht_data = NULL;
11441144
#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
13781378

13791379
/* }}} */
13801380
#if PHP_VERSION_ID >= 70000
1381-
PHONGO_API int phongo_bson_to_zval(const unsigned char *data, int data_len, zval *zv)
1381+
int phongo_bson_to_zval(const unsigned char *data, int data_len, zval *zv)
13821382
#else
1383-
PHONGO_API int phongo_bson_to_zval(const unsigned char *data, int data_len, zval **zv)
1383+
int phongo_bson_to_zval(const unsigned char *data, int data_len, zval **zv)
13841384
#endif
13851385
{
13861386
int retval = 0;
@@ -1396,7 +1396,7 @@ PHONGO_API int phongo_bson_to_zval(const unsigned char *data, int data_len, zval
13961396
return retval;
13971397
}
13981398

1399-
PHONGO_API int phongo_bson_to_zval_ex(const unsigned char *data, int data_len, php_phongo_bson_state *state)
1399+
int phongo_bson_to_zval_ex(const unsigned char *data, int data_len, php_phongo_bson_state *state)
14001400
{
14011401
bson_reader_t *reader;
14021402
bson_iter_t iter;
@@ -1552,7 +1552,7 @@ static void apply_classname_to_state(const char *classname, int classname_len, p
15521552
}
15531553
}
15541554

1555-
PHONGO_API void phongo_bson_typemap_to_state(zval *typemap, php_phongo_bson_typemap *map TSRMLS_DC)
1555+
void phongo_bson_typemap_to_state(zval *typemap, php_phongo_bson_typemap *map TSRMLS_DC)
15561556
{
15571557
if (typemap) {
15581558
char *classname;

0 commit comments

Comments
 (0)