diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-16 11:22:43 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-16 11:22:43 +0200 |
| commit | f684553c2cc6f717447f1bbd69b09ebcd6973dfa (patch) | |
| tree | af84ff9a8ca4a44dcd4ee336f0acb0391645b1be /ext/mysqli/mysqli_api.c | |
| parent | 0a2fd0db3cb57a567954c55e6607cf2102eb91ce (diff) | |
| parent | a1c1736bfb88d006542dc9bcc10d7101617517a6 (diff) | |
| download | php-git-f684553c2cc6f717447f1bbd69b09ebcd6973dfa.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix MySQL local infile / attr handling on big endian systems
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index ffbb841c19..6462c19c4d 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -2314,7 +2314,7 @@ PHP_FUNCTION(mysqli_stmt_attr_set) #if MYSQL_VERSION_ID >= 50107 my_bool mode_b; #endif - zend_ulong mode; + unsigned long mode; zend_long attr; void *mode_p; @@ -2357,7 +2357,7 @@ PHP_FUNCTION(mysqli_stmt_attr_get) { MY_STMT *stmt; zval *mysql_stmt; - zend_ulong value = 0; + unsigned long value = 0; zend_long attr; int rc; @@ -2374,7 +2374,7 @@ PHP_FUNCTION(mysqli_stmt_attr_get) if (attr == STMT_ATTR_UPDATE_MAX_LENGTH) value = *((my_bool *)&value); #endif - RETURN_LONG((zend_ulong)value); + RETURN_LONG((unsigned long)value); } /* }}} */ |