diff options
-rw-r--r-- | ext/mysqlnd/mysqlnd.h | 4 | ||||
-rw-r--r-- | ext/mysqlnd/mysqlnd_block_alloc.c | 4 | ||||
-rw-r--r-- | ext/mysqlnd/mysqlnd_block_alloc.h | 4 | ||||
-rw-r--r-- | ext/mysqlnd/mysqlnd_debug.h | 30 | ||||
-rw-r--r-- | ext/mysqlnd/mysqlnd_priv.h | 6 | ||||
-rw-r--r-- | ext/mysqlnd/mysqlnd_result.c | 3 | ||||
-rw-r--r-- | ext/mysqlnd/mysqlnd_result.h | 2 | ||||
-rw-r--r-- | ext/mysqlnd/mysqlnd_result_meta.c | 2 | ||||
-rw-r--r-- | ext/mysqlnd/mysqlnd_result_meta.h | 2 | ||||
-rw-r--r-- | ext/mysqlnd/mysqlnd_statistics.h | 2 | ||||
-rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.h | 10 |
11 files changed, 35 insertions, 34 deletions
diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h index 19285e7091..739e95d2c7 100644 --- a/ext/mysqlnd/mysqlnd.h +++ b/ext/mysqlnd/mysqlnd.h @@ -60,8 +60,8 @@ /* Library related */ -void mysqlnd_library_init(TSRMLS_D); -void mysqlnd_library_end(TSRMLS_D); +PHPAPI void mysqlnd_library_init(TSRMLS_D); +PHPAPI void mysqlnd_library_end(TSRMLS_D); PHPAPI unsigned int mysqlnd_plugin_register(); PHPAPI unsigned int mysqlnd_plugin_count(); diff --git a/ext/mysqlnd/mysqlnd_block_alloc.c b/ext/mysqlnd/mysqlnd_block_alloc.c index 2dcedcbfe6..90159148c2 100644 --- a/ext/mysqlnd/mysqlnd_block_alloc.c +++ b/ext/mysqlnd/mysqlnd_block_alloc.c @@ -160,7 +160,7 @@ MYSQLND_MEMORY_POOL_CHUNK * mysqlnd_mempool_get_chunk(MYSQLND_MEMORY_POOL * pool /* {{{ mysqlnd_mempool_create */ -MYSQLND_MEMORY_POOL * +PHPAPI MYSQLND_MEMORY_POOL * mysqlnd_mempool_create(size_t arena_size TSRMLS_DC) { /* We calloc, because we free(). We don't mnd_calloc() for a reason. */ @@ -179,7 +179,7 @@ mysqlnd_mempool_create(size_t arena_size TSRMLS_DC) /* {{{ mysqlnd_mempool_destroy */ -void +PHPAPI void mysqlnd_mempool_destroy(MYSQLND_MEMORY_POOL * pool TSRMLS_DC) { DBG_ENTER("mysqlnd_mempool_destroy"); diff --git a/ext/mysqlnd/mysqlnd_block_alloc.h b/ext/mysqlnd/mysqlnd_block_alloc.h index 505a23b2ee..0f234a6ee3 100644 --- a/ext/mysqlnd/mysqlnd_block_alloc.h +++ b/ext/mysqlnd/mysqlnd_block_alloc.h @@ -23,8 +23,8 @@ #ifndef MYSQLND_BLOCK_ALLOC_H #define MYSQLND_BLOCK_ALLOC_H -MYSQLND_MEMORY_POOL * mysqlnd_mempool_create(size_t arena_size TSRMLS_DC); -void mysqlnd_mempool_destroy(MYSQLND_MEMORY_POOL * pool TSRMLS_DC); +PHPAPI MYSQLND_MEMORY_POOL * mysqlnd_mempool_create(size_t arena_size TSRMLS_DC); +PHPAPI void mysqlnd_mempool_destroy(MYSQLND_MEMORY_POOL * pool TSRMLS_DC); #endif /* MYSQLND_BLOCK_ALLOC_H */ diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h index 2ac2f46679..763cf0d6c7 100644 --- a/ext/mysqlnd/mysqlnd_debug.h +++ b/ext/mysqlnd/mysqlnd_debug.h @@ -58,27 +58,27 @@ struct st_mysqlnd_debug const char ** skip_functions; }; -extern const char * mysqlnd_debug_std_no_trace_funcs[]; +PHPAPI extern const char * mysqlnd_debug_std_no_trace_funcs[]; PHPAPI MYSQLND_DEBUG * mysqlnd_debug_init(const char * skip_functions[] TSRMLS_DC); #define MYSQLND_MEM_D TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC -void * _mysqlnd_emalloc(size_t size MYSQLND_MEM_D); -void * _mysqlnd_pemalloc(size_t size, zend_bool persistent MYSQLND_MEM_D); -void * _mysqlnd_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D); -void * _mysqlnd_pecalloc(unsigned int nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D); -void * _mysqlnd_erealloc(void *ptr, size_t new_size MYSQLND_MEM_D); -void * _mysqlnd_perealloc(void *ptr, size_t new_size, zend_bool persistent MYSQLND_MEM_D); -void _mysqlnd_efree(void *ptr MYSQLND_MEM_D); -void _mysqlnd_pefree(void *ptr, zend_bool persistent MYSQLND_MEM_D); -void * _mysqlnd_malloc(size_t size MYSQLND_MEM_D); -void * _mysqlnd_calloc(unsigned int nmemb, size_t size MYSQLND_MEM_D); -void * _mysqlnd_realloc(void *ptr, size_t new_size MYSQLND_MEM_D); -void _mysqlnd_free(void *ptr MYSQLND_MEM_D); - -char * mysqlnd_get_backtrace(TSRMLS_D); +PHPAPI void * _mysqlnd_emalloc(size_t size MYSQLND_MEM_D); +PHPAPI void * _mysqlnd_pemalloc(size_t size, zend_bool persistent MYSQLND_MEM_D); +PHPAPI void * _mysqlnd_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D); +PHPAPI void * _mysqlnd_pecalloc(unsigned int nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D); +PHPAPI void * _mysqlnd_erealloc(void *ptr, size_t new_size MYSQLND_MEM_D); +PHPAPI void * _mysqlnd_perealloc(void *ptr, size_t new_size, zend_bool persistent MYSQLND_MEM_D); +PHPAPI void _mysqlnd_efree(void *ptr MYSQLND_MEM_D); +PHPAPI void _mysqlnd_pefree(void *ptr, zend_bool persistent MYSQLND_MEM_D); +PHPAPI void * _mysqlnd_malloc(size_t size MYSQLND_MEM_D); +PHPAPI void * _mysqlnd_calloc(unsigned int nmemb, size_t size MYSQLND_MEM_D); +PHPAPI void * _mysqlnd_realloc(void *ptr, size_t new_size MYSQLND_MEM_D); +PHPAPI void _mysqlnd_free(void *ptr MYSQLND_MEM_D); + +PHPAPI char * mysqlnd_get_backtrace(TSRMLS_D); #define DBG_INF_EX(dbg_obj, msg) do { if (dbg_skip_trace == FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "info : ", (msg)); } while (0) #define DBG_ERR_EX(dbg_obj, msg) do { if (dbg_skip_trace == FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "error: ", (msg)); } while (0) diff --git a/ext/mysqlnd/mysqlnd_priv.h b/ext/mysqlnd/mysqlnd_priv.h index b92a90f616..7eb38b68dd 100644 --- a/ext/mysqlnd/mysqlnd_priv.h +++ b/ext/mysqlnd/mysqlnd_priv.h @@ -154,9 +154,9 @@ struct st_mysqlnd_perm_bind { extern struct st_mysqlnd_perm_bind mysqlnd_ps_fetch_functions[MYSQL_TYPE_LAST + 1]; -extern const char * const mysqlnd_old_passwd; -extern const char * const mysqlnd_out_of_sync; -extern const char * const mysqlnd_server_gone; +PHPAPI extern const char * const mysqlnd_old_passwd; +PHPAPI extern const char * const mysqlnd_out_of_sync; +PHPAPI extern const char * const mysqlnd_server_gone; enum_func_status mysqlnd_handle_local_infile(MYSQLND *conn, const char *filename, zend_bool *is_warning TSRMLS_DC); diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index 35e7298dd8..17f493a474 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -1531,7 +1531,8 @@ MYSQLND_METHOD(mysqlnd_res, fetch_field_data)(MYSQLND_RES *result, unsigned int /* {{{ mysqlnd_result_init */ -MYSQLND_RES *mysqlnd_result_init(unsigned int field_count TSRMLS_DC) +PHPAPI MYSQLND_RES * +mysqlnd_result_init(unsigned int field_count TSRMLS_DC) { size_t alloc_size = sizeof(MYSQLND_RES) + mysqlnd_plugin_count() * sizeof(void *); MYSQLND_RES *ret = mnd_ecalloc(1, alloc_size); diff --git a/ext/mysqlnd/mysqlnd_result.h b/ext/mysqlnd/mysqlnd_result.h index 9d41c54f5a..1e9494419b 100644 --- a/ext/mysqlnd/mysqlnd_result.h +++ b/ext/mysqlnd/mysqlnd_result.h @@ -23,7 +23,7 @@ #ifndef MYSQLND_RESULT_H #define MYSQLND_RESULT_H -MYSQLND_RES *mysqlnd_result_init(unsigned int field_count TSRMLS_DC); +PHPAPI MYSQLND_RES * mysqlnd_result_init(unsigned int field_count TSRMLS_DC); enum_func_status mysqlnd_query_read_result_set_header(MYSQLND *conn, MYSQLND_STMT *stmt TSRMLS_DC); diff --git a/ext/mysqlnd/mysqlnd_result_meta.c b/ext/mysqlnd/mysqlnd_result_meta.c index d67aeb286c..cfb0fbc957 100644 --- a/ext/mysqlnd/mysqlnd_result_meta.c +++ b/ext/mysqlnd/mysqlnd_result_meta.c @@ -437,7 +437,7 @@ MYSQLND_CLASS_METHODS_END; /* {{{ mysqlnd_result_meta_init */ -MYSQLND_RES_METADATA * +PHPAPI MYSQLND_RES_METADATA * mysqlnd_result_meta_init(unsigned int field_count TSRMLS_DC) { MYSQLND_RES_METADATA *ret; diff --git a/ext/mysqlnd/mysqlnd_result_meta.h b/ext/mysqlnd/mysqlnd_result_meta.h index 0fd8299dcc..84e495d4c4 100644 --- a/ext/mysqlnd/mysqlnd_result_meta.h +++ b/ext/mysqlnd/mysqlnd_result_meta.h @@ -24,7 +24,7 @@ #define MYSQLND_RESULT_META_H -MYSQLND_RES_METADATA *mysqlnd_result_meta_init(unsigned int field_count TSRMLS_DC); +PHPAPI MYSQLND_RES_METADATA * mysqlnd_result_meta_init(unsigned int field_count TSRMLS_DC); diff --git a/ext/mysqlnd/mysqlnd_statistics.h b/ext/mysqlnd/mysqlnd_statistics.h index 7cc1667b18..b2b5adab96 100644 --- a/ext/mysqlnd/mysqlnd_statistics.h +++ b/ext/mysqlnd/mysqlnd_statistics.h @@ -24,7 +24,7 @@ #define MYSQLND_STATISTICS_H -extern MYSQLND_STATS *mysqlnd_global_stats; +PHPAPI extern MYSQLND_STATS * mysqlnd_global_stats; typedef struct st_mysqlnd_string { diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h index 0d482517f6..beb54845ed 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.h +++ b/ext/mysqlnd/mysqlnd_wireprotocol.h @@ -31,8 +31,8 @@ #define MYSQLND_NULL_LENGTH (unsigned long) ~0 /* Used in mysqlnd_debug.c */ -extern const char mysqlnd_read_header_name[]; -extern const char mysqlnd_read_body_name[]; +PHPAPI extern const char mysqlnd_read_header_name[]; +PHPAPI extern const char mysqlnd_read_body_name[]; /* Packet handling */ @@ -44,7 +44,7 @@ extern const char mysqlnd_read_body_name[]; ((packet)->header.m->free_mem((packet), FALSE TSRMLS_CC)); \ } while (0); -extern const char * const mysqlnd_command_to_text[COM_END]; +PHPAPI extern const char * const mysqlnd_command_to_text[COM_END]; /* Low-level extraction functionality */ typedef struct st_mysqlnd_packet_methods { @@ -244,12 +244,12 @@ typedef struct st_mysqlnd_packet_chg_user_resp { } MYSQLND_PACKET_CHG_USER_RESPONSE; -void php_mysqlnd_scramble(zend_uchar * const buffer, const zend_uchar * const scramble, const zend_uchar * const pass); +PHPAPI void php_mysqlnd_scramble(zend_uchar * const buffer, const zend_uchar * const scramble, const zend_uchar * const pass); unsigned long php_mysqlnd_net_field_length(zend_uchar **packet); zend_uchar * php_mysqlnd_net_store_length(zend_uchar *packet, uint64_t length); -extern char * const mysqlnd_empty_string; +PHPAPI extern char * const mysqlnd_empty_string; void php_mysqlnd_rowp_read_binary_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zval ** fields, |