diff options
| author | Andrey Hristov <andrey@php.net> | 2007-07-25 12:42:00 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2007-07-25 12:42:00 +0000 |
| commit | 7bb46902f82fc1d1235f3f3fcf98fcdcfa163bd1 (patch) | |
| tree | 8d11178230744cb5e91b51148ec145fb89a94b32 /ext/mysqli/mysqlnd/mysqlnd_wireprotocol.c | |
| parent | e9ccedf4276b905c0563337ddb38299b2ed4a7c5 (diff) | |
| download | php-git-7bb46902f82fc1d1235f3f3fcf98fcdcfa163bd1.tar.gz | |
Alignment fixes for 64bit and fixing macroses
Diffstat (limited to 'ext/mysqli/mysqlnd/mysqlnd_wireprotocol.c')
| -rw-r--r-- | ext/mysqli/mysqlnd/mysqlnd_wireprotocol.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/mysqli/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqli/mysqlnd/mysqlnd_wireprotocol.c index 8c7e780131..77f757e6c9 100644 --- a/ext/mysqli/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqli/mysqlnd/mysqlnd_wireprotocol.c @@ -268,7 +268,8 @@ int mysqlnd_set_sock_no_delay(php_stream *stream) */ size_t mysqlnd_stream_write_w_header(MYSQLND * const conn, char * const buf, size_t count TSRMLS_DC) { - zend_uchar safe_storage[MYSQLND_HEADER_SIZE]; + zend_uchar safe_buf[((MYSQLND_HEADER_SIZE) + (sizeof(zend_uchar)) - 1) / (sizeof(zend_uchar))]; + zend_uchar *safe_storage = (char *) &safe_buf; MYSQLND_NET *net = &conn->net; size_t old_chunk_size = net->stream->chunk_size; size_t ret, left = count, packets_sent = 1; @@ -315,7 +316,8 @@ static size_t mysqlnd_stream_write_w_command(MYSQLND * const conn, enum php_mysqlnd_server_command command, const char * const buf, size_t count TSRMLS_DC) { - zend_uchar safe_storage[MYSQLND_HEADER_SIZE + 1]; + zend_uchar safe_buf[((MYSQLND_HEADER_SIZE) + (sizeof(zend_uchar)) - 1) / (sizeof(zend_uchar))]; + zend_uchar *safe_storage = (char *) &safe_buf; MYSQLND_NET *net = &conn->net; size_t old_chunk_size = net->stream->chunk_size; size_t ret, left = count, header_len = MYSQLND_HEADER_SIZE + 1, packets_sent = 1; |