php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove int6store()

Browse Source 
The implementation is broken (syntactically). As it's not used
anyway, I'm just dropping it instead.
This commit is contained in:
Nikita Popov
2020-04-14 10:36:55 +02:00
parent 5951ff7ee5
commit d4471c6aae
2 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/mysqli/mysqli_api.c
View File

@@ -1715,7 +1715,7 @@ static int mysqli_options_get_option_zval_type(int option)
case MYSQL_OPT_LOCAL_INFILE:
case MYSQL_OPT_NAMED_PIPE:
#ifdef MYSQL_OPT_PROTOCOL
case MYSQL_OPT_PROTOCOL:
case MYSQL_OPT_PROTOCOL:
#endif /* MySQL 4.1.0 */
case MYSQL_OPT_READ_TIMEOUT:
case MYSQL_OPT_WRITE_TIMEOUT:

17
ext/mysqlnd/mysqlnd_portability.h
View File

@@ -154,15 +154,6 @@ This file is public domain and comes with NO WARRANTY of any kind */
*(((zend_uchar *)(T))+3)=(zend_uchar) (((A) >> 24)); \
*(((zend_uchar *)(T))+4)=(zend_uchar) (((A) >> 32)); }
/* From Andrey Hristov, based on int5store() */
#define int6store(T,A) { \
*(((zend_uchar *)(T)))= (zend_uchar)((A));\
*(((zend_uchar *)(T))+1))=(zend_uchar) (((A) >> 8));\
*(((zend_uchar *)(T))+2))=(zend_uchar) (((A) >> 16));\
*(((zend_uchar *)(T))+3))=(zend_uchar) (((A) >> 24)); \
*(((zend_uchar *)(T))+4))=(zend_uchar) (((A) >> 32)); \
*(((zend_uchar *)(T))+5))=(zend_uchar) (((A) >> 40)); }
#define int8store(T,A) *((uint64_t *) (T))= (uint64_t) (A)
typedef union {
@@ -236,14 +227,6 @@ typedef union {
*(((char *)(T))+2) = (char)(((A) >> 16));\
*(((char *)(T))+3) = (char)(((A) >> 24)); \
*(((char *)(T))+4) = (char)(((A) >> 32)); } while (0)
/* Based on int5store() from Andrey Hristov */
#define int6store(T,A) do { \
*(((char *)(T))) = (char)((A));\
*(((char *)(T))+1) = (char)(((A) >> 8));\
*(((char *)(T))+2) = (char)(((A) >> 16));\
*(((char *)(T))+3) = (char)(((A) >> 24)); \
*(((char *)(T))+4) = (char)(((A) >> 32)); \
*(((char *)(T))+5) = (char)(((A) >> 40)); } while (0)
#define int8store(T,A) { uint32_t def_temp= (uint32_t) (A), def_temp2= (uint32_t) ((A) >> 32); \
int4store((T),def_temp); \
int4store((T+4),def_temp2); \