Skip to content

Commit 0ea5ac2

Browse files
petkpetk
committed
Sync cache variable names in Zend
1 parent 912c5a2 commit 0ea5ac2

File tree

9 files changed

+106
-84
lines changed

9 files changed

+106
-84
lines changed

‎cmake/Zend/CMakeLists.txt‎

Lines changed: 36 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -391,58 +391,80 @@ install(
391391
# Configuration checks.
392392
################################################################################
393393

394-
check_include_files(cpuid.h HAVE_CPUID_H)
394+
check_include_files(cpuid.h PHP_ZEND_HAVE_CPUID_H)
395+
set(HAVE_CPUID_H ${PHP_ZEND_HAVE_CPUID_H})
395396

396-
check_symbol_exists(getpid unistd.h HAVE_GETPID)
397+
check_symbol_exists(getpid unistd.h PHP_ZEND_HAVE_GETPID)
398+
set(HAVE_GETPID ${PHP_ZEND_HAVE_GETPID})
397399

398400
cmake_push_check_state(RESET)
399401
set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
400-
check_symbol_exists(gettid unistd.h HAVE_GETTID)
402+
check_symbol_exists(gettid unistd.h PHP_ZEND_HAVE_GETTID)
403+
set(HAVE_GETTID ${PHP_ZEND_HAVE_GETTID})
401404
cmake_pop_check_state()
402405

403-
check_symbol_exists(kill signal.h HAVE_KILL)
406+
check_symbol_exists(kill signal.h PHP_ZEND_HAVE_KILL)
407+
set(HAVE_KILL ${PHP_ZEND_HAVE_KILL})
404408

405409
cmake_push_check_state(RESET)
406410
set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
407-
check_symbol_exists(mremap sys/mman.h HAVE_MREMAP)
411+
check_symbol_exists(mremap sys/mman.h PHP_ZEND_HAVE_MREMAP)
412+
set(HAVE_MREMAP ${PHP_ZEND_HAVE_MREMAP})
408413
cmake_pop_check_state()
409414

410415
block()
411416
set(headers pthread.h)
412417

413418
# BSD-based systems have pthread_attr_get_np in pthread_np.h.
414-
check_include_files(pthread_np.h PHP_HAS_PTHREAD_NP_H)
415-
if(PHP_HAS_PTHREAD_NP_H)
419+
check_include_files(pthread_np.h PHP_ZEND_HAVE_PTHREAD_NP_H)
420+
if(PHP_ZEND_HAVE_PTHREAD_NP_H)
416421
list(APPEND headers "pthread_np.h")
417422
endif()
418423

419424
check_symbol_exists(
420425
pthread_attr_get_np
421426
"${headers}"
422-
HAVE_PTHREAD_ATTR_GET_NP
427+
PHP_ZEND_HAVE_PTHREAD_ATTR_GET_NP
423428
)
429+
set(HAVE_PTHREAD_ATTR_GET_NP ${PHP_ZEND_HAVE_PTHREAD_ATTR_GET_NP})
424430
endblock()
425431

426432
check_symbol_exists(
427433
pthread_attr_getstack
428434
pthread.h
429-
HAVE_PTHREAD_ATTR_GETSTACK
435+
PHP_ZEND_HAVE_PTHREAD_ATTR_GETSTACK
430436
)
437+
set(HAVE_PTHREAD_ATTR_GETSTACK ${PHP_ZEND_HAVE_PTHREAD_ATTR_GETSTACK})
431438

432439
check_symbol_exists(
433440
pthread_get_stackaddr_np
434441
pthread.h
435-
HAVE_PTHREAD_GET_STACKADDR_NP
442+
PHP_ZEND_HAVE_PTHREAD_GET_STACKADDR_NP
436443
)
444+
set(HAVE_PTHREAD_GET_STACKADDR_NP ${PHP_ZEND_HAVE_PTHREAD_GET_STACKADDR_NP})
437445

438446
cmake_push_check_state(RESET)
439447
set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
440-
check_symbol_exists(pthread_getattr_np pthread.h HAVE_PTHREAD_GETATTR_NP)
448+
check_symbol_exists(
449+
pthread_getattr_np
450+
pthread.h
451+
PHP_ZEND_HAVE_PTHREAD_GETATTR_NP
452+
)
453+
set(HAVE_PTHREAD_GETATTR_NP ${PHP_ZEND_HAVE_PTHREAD_GETATTR_NP})
441454
cmake_pop_check_state()
442455

443-
check_symbol_exists(pthread_stackseg_np pthread.h HAVE_PTHREAD_STACKSEG_NP)
444-
check_symbol_exists(sigsetjmp setjmp.h HAVE_SIGSETJMP)
445-
check_symbol_exists(strnlen string.h HAVE_STRNLEN)
456+
check_symbol_exists(
457+
pthread_stackseg_np
458+
pthread.h
459+
PHP_ZEND_HAVE_PTHREAD_STACKSEG_NP
460+
)
461+
set(HAVE_PTHREAD_STACKSEG_NP ${PHP_ZEND_HAVE_PTHREAD_STACKSEG_NP})
462+
463+
check_symbol_exists(sigsetjmp setjmp.h PHP_ZEND_HAVE_SIGSETJMP)
464+
set(HAVE_SIGSETJMP ${PHP_ZEND_HAVE_SIGSETJMP})
465+
466+
check_symbol_exists(strnlen string.h PHP_ZEND_HAVE_STRNLEN)
467+
set(HAVE_STRNLEN ${PHP_ZEND_HAVE_STRNLEN})
446468

447469
include(cmake/CheckAsmGoto.cmake)
448470
include(cmake/CheckCpuidCount.cmake)

‎cmake/Zend/cmake/CheckAsmGoto.cmake‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
1616
endif()
1717

1818
# Skip in consecutive configuration phases.
19-
if(NOT DEFINED PHP_ZEND_HAS_ASM_GOTO)
19+
if(NOT DEFINED PHP_ZEND_HAVE_ASM_GOTO)
2020
message(CHECK_START "Checking for the inline assembly __asm__ goto support")
2121

2222
cmake_push_check_state(RESET)
@@ -32,14 +32,14 @@ if(NOT DEFINED PHP_ZEND_HAS_ASM_GOTO)
3232
end:
3333
return 0;
3434
}
35-
]] PHP_ZEND_HAS_ASM_GOTO)
35+
]] PHP_ZEND_HAVE_ASM_GOTO)
3636
cmake_pop_check_state()
3737

38-
if(PHP_ZEND_HAS_ASM_GOTO)
38+
if(PHP_ZEND_HAVE_ASM_GOTO)
3939
message(CHECK_PASS "yes")
4040
else()
4141
message(CHECK_FAIL "no")
4242
endif()
4343
endif()
4444

45-
set(HAVE_ASM_GOTO ${PHP_ZEND_HAS_ASM_GOTO})
45+
set(HAVE_ASM_GOTO ${PHP_ZEND_HAVE_ASM_GOTO})

‎cmake/Zend/cmake/CheckCpuidCount.cmake‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
1515
endif()
1616

1717
# Skip in consecutive configuration phases.
18-
if(NOT DEFINED PHP_ZEND_HAS_CPUID_COUNT)
18+
if(NOT DEFINED PHP_ZEND_HAVE_CPUID_COUNT)
1919
message(CHECK_START "Checking whether __cpuid_count is available")
2020

2121
cmake_push_check_state(RESET)
@@ -28,14 +28,14 @@ if(NOT DEFINED PHP_ZEND_HAS_CPUID_COUNT)
2828
__cpuid_count(0, 0, eax, ebx, ecx, edx);
2929
return 0;
3030
}
31-
]] PHP_ZEND_HAS_CPUID_COUNT)
31+
]] PHP_ZEND_HAVE_CPUID_COUNT)
3232
cmake_pop_check_state()
3333

34-
if(PHP_ZEND_HAS_CPUID_COUNT)
34+
if(PHP_ZEND_HAVE_CPUID_COUNT)
3535
message(CHECK_PASS "yes")
3636
else()
3737
message(CHECK_FAIL "no")
3838
endif()
3939
endif()
4040

41-
set(HAVE_CPUID_COUNT ${PHP_ZEND_HAS_CPUID_COUNT})
41+
set(HAVE_CPUID_COUNT ${PHP_ZEND_HAVE_CPUID_COUNT})

‎cmake/Zend/cmake/CheckDlsym.cmake‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
1818
endif()
1919

2020
# Skip in consecutive configuration phases.
21-
if(DEFINED PHP_ZEND_HAS_DLSYM_NEEDS_UNDERSCORE)
22-
set(DLSYM_NEEDS_UNDERSCORE ${PHP_ZEND_HAS_DLSYM_NEEDS_UNDERSCORE})
21+
if(DEFINED PHP_ZEND_DLSYM_NEEDS_UNDERSCORE)
22+
set(DLSYM_NEEDS_UNDERSCORE ${PHP_ZEND_DLSYM_NEEDS_UNDERSCORE})
2323
return()
2424
endif()
2525

@@ -33,9 +33,9 @@ message(
3333
if(
3434
CMAKE_CROSSCOMPILING
3535
AND NOT CMAKE_CROSSCOMPILING_EMULATOR
36-
AND NOT DEFINED PHP_ZEND_HAS_DLSYM_NEEDS_UNDERSCORE_EXITCODE
36+
AND NOT DEFINED PHP_ZEND_DLSYM_NEEDS_UNDERSCORE_EXITCODE
3737
)
38-
set(PHP_ZEND_HAS_DLSYM_NEEDS_UNDERSCORE_EXITCODE 0)
38+
set(PHP_ZEND_DLSYM_NEEDS_UNDERSCORE_EXITCODE 0)
3939
endif()
4040

4141
check_include_files(dlfcn.h HAVE_DLFCN_H)
@@ -46,8 +46,8 @@ block()
4646
endif()
4747

4848
try_run(
49-
PHP_ZEND_HAS_DLSYM_NEEDS_UNDERSCORE_EXITCODE
50-
PHP_ZEND_HAS_DLSYM_NEEDS_UNDERSCORE_COMPILED
49+
PHP_ZEND_DLSYM_NEEDS_UNDERSCORE_EXITCODE
50+
PHP_ZEND_DLSYM_NEEDS_UNDERSCORE_COMPILED
5151
SOURCE_FROM_CONTENT src.c [[
5252
#ifdef HAVE_DLFCN_H
5353
# include <dlfcn.h>
@@ -122,21 +122,21 @@ block()
122122
endblock()
123123

124124
set(
125-
PHP_ZEND_HAS_DLSYM_NEEDS_UNDERSCORE
125+
PHP_ZEND_DLSYM_NEEDS_UNDERSCORE
126126
""
127127
CACHE INTERNAL
128128
"Whether 'dlsym()' requires a leading underscore in symbol names."
129129
)
130130

131131
if(
132-
PHP_ZEND_HAS_DLSYM_NEEDS_UNDERSCORE_COMPILED
133-
AND PHP_ZEND_HAS_DLSYM_NEEDS_UNDERSCORE_EXITCODE EQUAL 2
132+
PHP_ZEND_DLSYM_NEEDS_UNDERSCORE_COMPILED
133+
AND PHP_ZEND_DLSYM_NEEDS_UNDERSCORE_EXITCODE EQUAL 2
134134
)
135-
set_property(CACHE PHP_ZEND_HAS_DLSYM_NEEDS_UNDERSCORE PROPERTY VALUE TRUE)
135+
set_property(CACHE PHP_ZEND_DLSYM_NEEDS_UNDERSCORE PROPERTY VALUE TRUE)
136136
message(CHECK_FAIL "yes")
137137
else()
138-
set_property(CACHE PHP_ZEND_HAS_DLSYM_NEEDS_UNDERSCORE PROPERTY VALUE FALSE)
138+
set_property(CACHE PHP_ZEND_DLSYM_NEEDS_UNDERSCORE PROPERTY VALUE FALSE)
139139
message(CHECK_PASS "no")
140140
endif()
141141

142-
set(DLSYM_NEEDS_UNDERSCORE ${PHP_ZEND_HAS_DLSYM_NEEDS_UNDERSCORE})
142+
set(DLSYM_NEEDS_UNDERSCORE ${PHP_ZEND_DLSYM_NEEDS_UNDERSCORE})

‎cmake/Zend/cmake/CheckFloatPrecision.cmake‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ endif()
2323
# Obsolete in favor of C99 <fenv.h> functions to control FPU rounding modes.
2424
function(_php_zend_check_fpu_setcw result)
2525
# Skip in consecutive configuration phases.
26-
if(NOT DEFINED PHP_ZEND_HAS_FPU_SETCW)
26+
if(NOT DEFINED PHP_ZEND_${result})
2727
message(CHECK_START "Checking for usable _FPU_SETCW")
2828

2929
cmake_push_check_state(RESET)
@@ -48,24 +48,24 @@ function(_php_zend_check_fpu_setcw result)
4848

4949
return 0;
5050
}
51-
]] PHP_ZEND_HAS_FPU_SETCW)
51+
]] PHP_ZEND_${result})
5252
cmake_pop_check_state()
5353

54-
if(PHP_ZEND_HAS_FPU_SETCW)
54+
if(PHP_ZEND_${result})
5555
message(CHECK_PASS "yes")
5656
else()
5757
message(CHECK_FAIL "no")
5858
endif()
5959
endif()
6060

61-
set(${result} ${PHP_ZEND_HAS_FPU_SETCW})
61+
set(${result} ${PHP_ZEND_${result}})
6262

6363
return(PROPAGATE ${result})
6464
endfunction()
6565

6666
function(_php_zend_check_fpsetprec result)
6767
# Skip in consecutive configuration phases.
68-
if(NOT DEFINED PHP_ZEND_HAS_FPSETPREC)
68+
if(NOT DEFINED PHP_ZEND_${result})
6969
message(CHECK_START "Checking for usable fpsetprec")
7070

7171
cmake_push_check_state(RESET)
@@ -89,24 +89,24 @@ function(_php_zend_check_fpsetprec result)
8989

9090
return 0;
9191
}
92-
]] PHP_ZEND_HAS_FPSETPREC)
92+
]] PHP_ZEND_${result})
9393
cmake_pop_check_state()
9494

95-
if(PHP_ZEND_HAS_FPSETPREC)
95+
if(PHP_ZEND_${result})
9696
message(CHECK_PASS "yes")
9797
else()
9898
message(CHECK_FAIL "no")
9999
endif()
100100
endif()
101101

102-
set(${result} ${PHP_ZEND_HAS_FPSETPREC})
102+
set(${result} ${PHP_ZEND_${result}})
103103

104104
return(PROPAGATE ${result})
105105
endfunction()
106106

107107
function(_php_zend_check_controlfp result)
108108
# Skip in consecutive configuration phases.
109-
if(NOT DEFINED PHP_ZEND_HAS_CONTROLFP)
109+
if(NOT DEFINED PHP_ZEND_${result})
110110
message(CHECK_START "Checking for usable _controlfp")
111111

112112
cmake_push_check_state(RESET)
@@ -130,24 +130,24 @@ function(_php_zend_check_controlfp result)
130130

131131
return 0;
132132
}
133-
]] PHP_ZEND_HAS_CONTROLFP)
133+
]] PHP_ZEND_${result})
134134
cmake_pop_check_state()
135135

136-
if(PHP_ZEND_HAS_CONTROLFP)
136+
if(PHP_ZEND_${result})
137137
message(CHECK_PASS "yes")
138138
else()
139139
message(CHECK_FAIL "no")
140140
endif()
141141
endif()
142142

143-
set(${result} ${PHP_ZEND_HAS_CONTROLFP})
143+
set(${result} ${PHP_ZEND_${result}})
144144

145145
return(PROPAGATE ${result})
146146
endfunction()
147147

148148
function(_php_zend_check_controlfp_s result)
149149
# Skip in consecutive configuration phases.
150-
if(NOT DEFINED PHP_ZEND_HAS_CONTROLFP_S)
150+
if(NOT DEFINED PHP_ZEND_${result})
151151
message(CHECK_START "Checking for usable _controlfp_s")
152152

153153
cmake_push_check_state(RESET)
@@ -172,24 +172,24 @@ function(_php_zend_check_controlfp_s result)
172172

173173
return 0;
174174
}
175-
]] PHP_ZEND_HAS_CONTROLFP_S)
175+
]] PHP_ZEND_${result})
176176
cmake_pop_check_state()
177177

178-
if(PHP_ZEND_HAS_CONTROLFP_S)
178+
if(PHP_ZEND_${result})
179179
message(CHECK_PASS "yes")
180180
else()
181181
message(CHECK_FAIL "no")
182182
endif()
183183
endif()
184184

185-
set(${result} ${PHP_ZEND_HAS_CONTROLFP_S})
185+
set(${result} ${PHP_ZEND_${result}})
186186

187187
return(PROPAGATE ${result})
188188
endfunction()
189189

190190
function(_php_zend_check_fpu_inline_asm_x86 result)
191191
# Skip in consecutive configuration phases.
192-
if(NOT DEFINED PHP_ZEND_HAS_FPU_INLINE_ASM_X86)
192+
if(NOT DEFINED PHP_ZEND_${result})
193193
message(
194194
CHECK_START
195195
"Checking whether FPU control word can be manipulated by inline assembler"
@@ -215,17 +215,17 @@ function(_php_zend_check_fpu_inline_asm_x86 result)
215215

216216
return 0;
217217
}
218-
]] PHP_ZEND_HAS_FPU_INLINE_ASM_X86)
218+
]] PHP_ZEND_${result})
219219
cmake_pop_check_state()
220220

221-
if(PHP_ZEND_HAS_FPU_INLINE_ASM_X86)
221+
if(PHP_ZEND_${result})
222222
message(CHECK_PASS "yes")
223223
else()
224224
message(CHECK_FAIL "no")
225225
endif()
226226
endif()
227227

228-
set(${result} ${PHP_ZEND_HAS_FPU_INLINE_ASM_X86})
228+
set(${result} ${PHP_ZEND_${result}})
229229

230230
return(PROPAGATE ${result})
231231
endfunction()

‎cmake/Zend/cmake/CheckStrerrorR.cmake‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
1818
return()
1919
endif()
2020

21-
check_symbol_exists(strerror_r string.h PHP_ZEND_HAS_STRERROR_R)
21+
check_symbol_exists(strerror_r string.h PHP_ZEND_HAVE_STRERROR_R)
2222

23-
if(NOT PHP_ZEND_HAS_STRERROR_R)
23+
if(NOT PHP_ZEND_HAVE_STRERROR_R)
2424
return()
2525
endif()
2626

2727
set(HAVE_STRERROR_R TRUE)
2828

2929
# Skip in consecutive configuration phases.
30-
if(NOT DEFINED PHP_ZEND_HAS_STRERROR_R_CHAR_P)
30+
if(NOT DEFINED PHP_ZEND_STRERROR_R_CHAR_P)
3131
message(CHECK_START "Checking strerror_r() return type")
3232

3333
cmake_push_check_state(RESET)
@@ -44,14 +44,14 @@ if(NOT DEFINED PHP_ZEND_HAS_STRERROR_R_CHAR_P)
4444
char *p = strerror_r (0, buf, sizeof buf);
4545
return !p || x;
4646
}
47-
]] PHP_ZEND_HAS_STRERROR_R_CHAR_P)
47+
]] PHP_ZEND_STRERROR_R_CHAR_P)
4848
cmake_pop_check_state()
4949

50-
if(PHP_ZEND_HAS_STRERROR_R_CHAR_P)
50+
if(PHP_ZEND_STRERROR_R_CHAR_P)
5151
message(CHECK_PASS "char *")
5252
else()
5353
message(CHECK_PASS "int")
5454
endif()
5555
endif()
5656

57-
set(STRERROR_R_CHAR_P ${PHP_ZEND_HAS_STRERROR_R_CHAR_P})
57+
set(STRERROR_R_CHAR_P ${PHP_ZEND_STRERROR_R_CHAR_P})

0 commit comments

Comments
 (0)