Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ env:
CXX: ccache g++
jobs:
LINUX_X64:
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
if: false
services:
mysql:
image: mysql:8.3
Expand Down Expand Up @@ -180,6 +180,8 @@ jobs:
configurationParameters: >-
--enable-debug
--enable-zts
--enable-address-sanitizer
--enable-undefined-sanitizer
- name: make
run: make -j$(/usr/bin/nproc) >/dev/null
- name: make install
Expand All @@ -191,8 +193,9 @@ jobs:
runTestsParameters: >-
-d zend_extension=opcache.so
-d opcache.enable_cli=1
--asan
MACOS_DEBUG_NTS:
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
if: false
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -234,7 +237,7 @@ jobs:
- name: Verify generated files are up to date
uses: ./.github/actions/verify-generated-files
WINDOWS:
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
if: false
name: WINDOWS_X64_ZTS
runs-on: windows-2022
env:
Expand All @@ -261,7 +264,7 @@ jobs:
run: .github/scripts/windows/test.bat
BENCHMARKING:
name: BENCHMARKING
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
if: false
runs-on: ubuntu-22.04
steps:
- name: git checkout
Expand Down
4 changes: 2 additions & 2 deletions ext/gd/libgd/gd_filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
#define GET_PIXEL_FUNCTION(src)(src->trueColor?gdImageGetTrueColorPixel:gdImageGetPixel)

#ifdef _WIN32
# define GD_SCATTER_SEED() (unsigned int)(time(0) * GetCurrentProcessId())
# define GD_SCATTER_SEED() ((unsigned int)time(0) * (unsigned int)GetCurrentProcessId())
#else
# define GD_SCATTER_SEED() (unsigned int)(time(0) * getpid())
# define GD_SCATTER_SEED() ((unsigned int)time(0) * (unsigned int)getpid())
#endif

int gdImageScatter(gdImagePtr im, int sub, int plus)
Expand Down
2 changes: 1 addition & 1 deletion ext/mysqlnd/mysqlnd_portability.h
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ This file is public domain and comes with NO WARRANTY of any kind */
*/

/* Optimized store functions for Intel x86, non-valid for WIN64. __i386__ is GCC */
#if defined(__i386__) && !defined(_WIN64)
#if 0
#define sint2korr(A) (*((int16_t *) (A)))
#define sint3korr(A) ((int32_t) ((((zend_uchar) (A)[2]) & 128) ? \
(((uint32_t) 255L << 24) | \
Expand Down
Loading