Skip to content

Commit 1618f66

Browse files
committed
Fix [-Wstrict-prototypes] warning in MySQLnd extension
1 parent 0f0674d commit 1618f66

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

ext/mysqlnd/mysqlnd_ext_plugin.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,73 +51,73 @@ struct st_mysqlnd_plugin_methods_xetters
5151
{
5252
struct st_mnd_object_factory_xetters
5353
{
54-
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_object_factory) * (*get)();
54+
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_object_factory) * (*get)(void);
5555
void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_object_factory) *methods);
5656
} object_factory;
5757

5858
struct st_mnd_connection_xetters
5959
{
60-
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn) * (*get)();
60+
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn) * (*get)(void);
6161
void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn) *methods);
6262
} connection;
6363

6464
struct st_mnd_connection_data_xetters
6565
{
66-
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data) * (*get)();
66+
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data) * (*get)(void);
6767
void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data) *methods);
6868
} connection_data;
6969

7070
struct st_mnd_result_xetters
7171
{
72-
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_res) * (*get)();
72+
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_res) * (*get)(void);
7373
void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_res) *methods);
7474
} result;
7575

7676
struct st_mnd_unbuffered_result_xetters
7777
{
78-
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_result_unbuffered) * (*get)();
78+
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_result_unbuffered) * (*get)(void);
7979
void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_result_unbuffered) *methods);
8080
} unbuffered_result;
8181

8282
struct st_mnd_buffered_result_xetters
8383
{
84-
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_result_buffered)* (*get)();
84+
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_result_buffered)* (*get)(void);
8585
void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_result_buffered) *methods);
8686
} buffered_result;
8787

8888
struct st_mnd_stmt_xetters
8989
{
90-
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_stmt) * (*get)();
90+
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_stmt) * (*get)(void);
9191
void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_stmt) * methods);
9292
} statement;
9393

9494
struct st_mnd_protocol_xetters
9595
{
96-
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_payload_decoder_factory)* (*get)();
96+
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_payload_decoder_factory)* (*get)(void);
9797
void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_payload_decoder_factory) *methods);
9898
} protocol;
9999

100100
struct st_mnd_pfc_xetters
101101
{
102-
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_frame_codec) * (*get)();
102+
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_frame_codec) * (*get)(void);
103103
void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_frame_codec) * methods);
104104
} pfc;
105105

106106
struct st_mnd_vio_xetters
107107
{
108-
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_vio) * (*get)();
108+
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_vio) * (*get)(void);
109109
void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_vio) * methods);
110110
} vio;
111111

112112
struct st_mnd_error_info_xetters
113113
{
114-
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_error_info) * (*get)();
114+
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_error_info) * (*get)(void);
115115
void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_error_info) * methods);
116116
} error_info;
117117

118118
struct st_mnd_command_xetters
119119
{
120-
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_command) * (*get)();
120+
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_command) * (*get)(void);
121121
void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_command) * methods);
122122
} command;
123123
};

ext/mysqlnd/mysqlnd_ps.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ extern struct st_mysqlnd_perm_bind mysqlnd_ps_fetch_functions[MYSQL_TYPE_LAST +
3535
enum_func_status mysqlnd_stmt_fetch_row_buffered(MYSQLND_RES * result, void * param, const unsigned int flags, zend_bool * fetched_anything);
3636
enum_func_status mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES * result, void * param, const unsigned int flags, zend_bool * fetched_anything);
3737

38-
void _mysqlnd_init_ps_subsystem();/* This one is private, mysqlnd_library_init() will call it */
39-
void _mysqlnd_init_ps_fetch_subsystem();
38+
void _mysqlnd_init_ps_subsystem(void);/* This one is private, mysqlnd_library_init() will call it */
39+
void _mysqlnd_init_ps_fetch_subsystem(void);
4040

4141
void ps_fetch_from_1_to_8_bytes(zval * zv, const MYSQLND_FIELD * const field, const unsigned int pack_len, const zend_uchar ** row, unsigned int byte_count);
4242

0 commit comments

Comments
 (0)