mirror of
https://github.com/php/php-src.git
synced 2026-03-31 04:32:19 +02:00
Fix some level 1 MSVC compiler warnings on x86
See GH-8479.
This commit is contained in:
committed by
Christoph M. Becker
parent
5ba6ecd523
commit
fb1c7eff04
@@ -2925,7 +2925,7 @@ static int zend_jit_setup(void)
|
||||
/* To find offset of "_tsrm_ls_cache" in TLS segment we perform a linear scan of local TLS memory */
|
||||
/* Probably, it might be better solution */
|
||||
do {
|
||||
void ***tls_mem = ((void***)__readfsdword(0x2c))[_tls_index];
|
||||
void ***tls_mem = ((void**)__readfsdword(0x2c))[_tls_index];
|
||||
void *val = _tsrm_ls_cache;
|
||||
size_t offset = 0;
|
||||
size_t size = (char*)&_tls_end - (char*)&_tls_start;
|
||||
|
||||
@@ -879,7 +879,11 @@ static int php_stdiop_set_option(php_stream *stream, int option, int value, void
|
||||
size_t rounded_offset = (range->offset / gran) * gran;
|
||||
delta = range->offset - rounded_offset;
|
||||
loffs = (DWORD)rounded_offset;
|
||||
#ifdef _WIN64
|
||||
hoffs = (DWORD)(rounded_offset >> 32);
|
||||
#else
|
||||
hoffs = 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
/* MapViewOfFile()ing zero bytes would map to the end of the file; match *nix behavior instead */
|
||||
|
||||
Reference in New Issue
Block a user