Skip to content

Commit fb1c7ef

Browse files
mvorisekcmb69
authored andcommitted
Fix some level 1 MSVC compiler warnings on x86
See GH-8479.
1 parent 5ba6ecd commit fb1c7ef

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2925,7 +2925,7 @@ static int zend_jit_setup(void)
29252925
/* To find offset of "_tsrm_ls_cache" in TLS segment we perform a linear scan of local TLS memory */
29262926
/* Probably, it might be better solution */
29272927
do {
2928-
void ***tls_mem = ((void***)__readfsdword(0x2c))[_tls_index];
2928+
void ***tls_mem = ((void**)__readfsdword(0x2c))[_tls_index];
29292929
void *val = _tsrm_ls_cache;
29302930
size_t offset = 0;
29312931
size_t size = (char*)&_tls_end - (char*)&_tls_start;

main/streams/plain_wrapper.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,11 @@ static int php_stdiop_set_option(php_stream *stream, int option, int value, void
879879
size_t rounded_offset = (range->offset / gran) * gran;
880880
delta = range->offset - rounded_offset;
881881
loffs = (DWORD)rounded_offset;
882+
#ifdef _WIN64
882883
hoffs = (DWORD)(rounded_offset >> 32);
884+
#else
885+
hoffs = 0;
886+
#endif
883887
}
884888

885889
/* MapViewOfFile()ing zero bytes would map to the end of the file; match *nix behavior instead */

0 commit comments

Comments
 (0)