more typedef cosmetics

diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
index 4332102f5a9dbfc4a2dda3efa851199206f84ad3..9938d3abac3594acb61281319052f3ca3a48c7f4 100644 (file)
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -238,7 +238,7 @@ php_mysqlnd_read_error_from_line(zend_uchar *buf, size_t buf_len,
 
 /* {{{ mysqlnd_read_header */
 static enum_func_status
-mysqlnd_read_header(MYSQLND * conn, mysqlnd_packet_header * header TSRMLS_DC)
+mysqlnd_read_header(MYSQLND * conn, MYSQLND_PACKET_HEADER * header TSRMLS_DC)
 {
        MYSQLND_NET * net = conn->net;
        zend_uchar buffer[MYSQLND_HEADER_SIZE];
@@ -1023,7 +1023,7 @@ php_mysqlnd_read_row_ex(MYSQLND *conn, MYSQLND_MEMORY_POOL * result_set_memory_p
                                                unsigned int prealloc_more_bytes TSRMLS_DC)
 {
        enum_func_status ret = PASS;
-       mysqlnd_packet_header header;
+       MYSQLND_PACKET_HEADER header;
        zend_uchar *p = NULL;
        zend_bool first_iteration = TRUE;
 

diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h
index 22c68ebbe0f1db972f2ed9a44cc0c2b6346ea429..c3cd86a48d467121fce92b59c4d1d1a467ef1a4b 100644 (file)
--- a/ext/mysqlnd/mysqlnd_wireprotocol.h
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.h
@@ -60,11 +60,11 @@ typedef struct st_mysqlnd_packet_header {
        mysqlnd_packet_methods *m;
        zend_uchar      packet_no;
        zend_bool       persistent;
-} mysqlnd_packet_header;
+} MYSQLND_PACKET_HEADER;
 
 /* Server greets the client */
 typedef struct st_mysqlnd_packet_greet {
-       mysqlnd_packet_header           header;
+       MYSQLND_PACKET_HEADER           header;
        uint8_t         protocol_version;
        char            *server_version;
        uint32_t        thread_id;
@@ -84,7 +84,7 @@ typedef struct st_mysqlnd_packet_greet {
 
 /* Client authenticates */
 typedef struct st_mysqlnd_packet_auth {
-       mysqlnd_packet_header           header;
+       MYSQLND_PACKET_HEADER           header;
        uint32_t        client_flags;
        uint32_t        max_packet_size;
        uint8_t charset_no;
@@ -103,7 +103,7 @@ typedef struct st_mysqlnd_packet_auth {
 
 /* OK packet */
 typedef struct st_mysqlnd_packet_ok {
-       mysqlnd_packet_header           header;
+       MYSQLND_PACKET_HEADER           header;
        uint8_t         field_count; /* always 0x0 */
        uint64_t        affected_rows;
        uint64_t        last_insert_id;
@@ -120,7 +120,7 @@ typedef struct st_mysqlnd_packet_ok {
 
 /* Command packet */
 typedef struct st_mysqlnd_packet_command {
-       mysqlnd_packet_header                   header;
+       MYSQLND_PACKET_HEADER                   header;
        enum php_mysqlnd_server_command command;
        const char                                              *argument;
        size_t                                                  arg_len;
@@ -129,7 +129,7 @@ typedef struct st_mysqlnd_packet_command {
 
 /* EOF packet */
 typedef struct st_mysqlnd_packet_eof {
-       mysqlnd_packet_header           header;
+       MYSQLND_PACKET_HEADER           header;
        uint8_t         field_count; /* 0xFE */
        uint16_t        warning_count;
        uint16_t        server_status;
@@ -143,7 +143,7 @@ typedef struct st_mysqlnd_packet_eof {
 
 /* Result Set header*/
 typedef struct st_mysqlnd_packet_rset_header {
-       mysqlnd_packet_header           header;
+       MYSQLND_PACKET_HEADER           header;
        /*
          0x00 => ok
          ~0   => LOAD DATA LOCAL
@@ -169,7 +169,7 @@ typedef struct st_mysqlnd_packet_rset_header {
 
 /* Result set field packet */
 typedef struct st_mysqlnd_packet_res_field {
-       mysqlnd_packet_header   header;
+       MYSQLND_PACKET_HEADER   header;
        MYSQLND_FIELD                   *metadata;
        /* For table definitions, empty for result sets */
        zend_bool                               skip_parsing;
@@ -181,7 +181,7 @@ typedef struct st_mysqlnd_packet_res_field {
 
 /* Row packet */
 typedef struct st_mysqlnd_packet_row {
-       mysqlnd_packet_header   header;
+       MYSQLND_PACKET_HEADER   header;
        zval            **fields;
        uint32_t        field_count;
        zend_bool       eof;
@@ -210,7 +210,7 @@ typedef struct st_mysqlnd_packet_row {
 
 /* Statistics packet */
 typedef struct st_mysqlnd_packet_stats {
-       mysqlnd_packet_header   header;
+       MYSQLND_PACKET_HEADER   header;
        char *message;
        /* message_len is not part of the packet*/
        size_t message_len;
@@ -219,7 +219,7 @@ typedef struct st_mysqlnd_packet_stats {
 
 /* COM_PREPARE response packet */
 typedef struct st_mysqlnd_packet_prepare_response {
-       mysqlnd_packet_header   header;
+       MYSQLND_PACKET_HEADER   header;
        /* also known as field_count 0x00=OK , 0xFF=error */
        unsigned char   error_code;
        unsigned long   stmt_id;
@@ -234,7 +234,7 @@ typedef struct st_mysqlnd_packet_prepare_response {
 
 /* Statistics packet */
 typedef struct st_mysqlnd_packet_chg_user_resp {
-       mysqlnd_packet_header   header;
+       MYSQLND_PACKET_HEADER   header;
        uint32_t                        field_count;
 
        /* message_len is not part of the packet*/