Skip to content

Commit 212b283

Browse files
petkpetk
authored
Autotools: Sync indentation style in build system files (#14725)
1 parent 4df90af commit 212b283

File tree

10 files changed

+156
-156
lines changed

10 files changed

+156
-156
lines changed

‎Zend/Zend.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ if test "$ZEND_DEBUG" = "yes"; then
173173
AC_DEFINE(ZEND_DEBUG,1,[ ])
174174
echo " $CFLAGS" | grep ' -g' >/dev/null || DEBUG_CFLAGS="-g"
175175
if test "$CFLAGS" = "-g -O2"; then
176-
CFLAGS=-g
176+
CFLAGS=-g
177177
fi
178178
else
179179
AC_DEFINE(ZEND_DEBUG,0,[ ])

‎build/php.m4

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,10 +1022,10 @@ $3
10221022
10231023
int main(void)
10241024
{
1025-
FILE *fp = fopen("conftestval", "w");
1026-
if (!fp) return(1);
1027-
fprintf(fp, "%d\n", sizeof($1));
1028-
return(0);
1025+
FILE *fp = fopen("conftestval", "w");
1026+
if (!fp) return(1);
1027+
fprintf(fp, "%d\n", sizeof($1));
1028+
return(0);
10291029
}
10301030
]])], [
10311031
eval $php_cache_value=`cat conftestval`

‎ext/dba/config.m4

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -233,25 +233,25 @@ dnl TCADB
233233
if test "$PHP_TCADB" != "no"; then
234234
PHP_DBA_STD_BEGIN
235235
for i in $PHP_TCADB /usr/local /usr; do
236-
if test -f "$i/include/tcadb.h"; then
237-
THIS_PREFIX=$i
238-
PHP_ADD_INCLUDE($THIS_PREFIX/include)
239-
THIS_INCLUDE=$i/include/tcadb.h
240-
break
241-
fi
236+
if test -f "$i/include/tcadb.h"; then
237+
THIS_PREFIX=$i
238+
PHP_ADD_INCLUDE($THIS_PREFIX/include)
239+
THIS_INCLUDE=$i/include/tcadb.h
240+
break
241+
fi
242242
done
243243

244244
if test -n "$THIS_INCLUDE"; then
245-
for LIB in tokyocabinet; do
246-
PHP_CHECK_LIBRARY($LIB, tcadbopen, [
247-
AC_DEFINE_UNQUOTED(TCADB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
248-
AC_DEFINE(DBA_TCADB, 1, [ ])
249-
THIS_LIBS=$LIB
250-
], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
251-
if test -n "$THIS_LIBS"; then
252-
break
253-
fi
254-
done
245+
for LIB in tokyocabinet; do
246+
PHP_CHECK_LIBRARY($LIB, tcadbopen, [
247+
AC_DEFINE_UNQUOTED(TCADB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
248+
AC_DEFINE(DBA_TCADB, 1, [ ])
249+
THIS_LIBS=$LIB
250+
], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
251+
if test -n "$THIS_LIBS"; then
252+
break
253+
fi
254+
done
255255
fi
256256

257257
PHP_DBA_STD_ASSIGN
@@ -264,25 +264,25 @@ dnl LMDB
264264
if test "$PHP_LMDB" != "no"; then
265265
PHP_DBA_STD_BEGIN
266266
for i in $PHP_LMDB /usr/local /usr; do
267-
if test -f "$i/include/lmdb.h"; then
268-
THIS_PREFIX=$i
269-
PHP_ADD_INCLUDE($THIS_PREFIX/include)
270-
THIS_INCLUDE=$i/include/lmdb.h
271-
break
272-
fi
267+
if test -f "$i/include/lmdb.h"; then
268+
THIS_PREFIX=$i
269+
PHP_ADD_INCLUDE($THIS_PREFIX/include)
270+
THIS_INCLUDE=$i/include/lmdb.h
271+
break
272+
fi
273273
done
274274

275275
if test -n "$THIS_INCLUDE"; then
276-
for LIB in lmdb; do
277-
PHP_CHECK_LIBRARY($LIB, mdb_env_open, [
278-
AC_DEFINE_UNQUOTED(LMDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
279-
AC_DEFINE(DBA_LMDB, 1, [ ])
280-
THIS_LIBS=$LIB
281-
], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
282-
if test -n "$THIS_LIBS"; then
283-
break
284-
fi
285-
done
276+
for LIB in lmdb; do
277+
PHP_CHECK_LIBRARY($LIB, mdb_env_open, [
278+
AC_DEFINE_UNQUOTED(LMDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
279+
AC_DEFINE(DBA_LMDB, 1, [ ])
280+
THIS_LIBS=$LIB
281+
], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
282+
if test -n "$THIS_LIBS"; then
283+
break
284+
fi
285+
done
286286
fi
287287

288288
PHP_DBA_STD_ASSIGN

‎ext/json/config.m4

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
PHP_NEW_EXTENSION(json,
2-
json.c \
3-
json_encoder.c \
4-
json_parser.tab.c \
5-
json_scanner.c,
6-
no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
2+
json.c \
3+
json_encoder.c \
4+
json_parser.tab.c \
5+
json_scanner.c,
6+
no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
77
PHP_INSTALL_HEADERS([ext/json], [php_json.h php_json_parser.h php_json_scanner.h])
88
PHP_ADD_MAKEFILE_FRAGMENT()

‎ext/opcache/config.m4

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ if test "$PHP_OPCACHE" != "no"; then
5252
AC_DEFINE(HAVE_JIT, 1, [Define to enable JIT])
5353
AC_DEFINE(ZEND_JIT_IR, 1, [Use JIT IR framework])
5454
ZEND_JIT_SRC="jit/zend_jit.c jit/zend_jit_vm_helpers.c jit/ir/ir.c jit/ir/ir_strtab.c \
55-
jit/ir/ir_cfg.c jit/ir/ir_sccp.c jit/ir/ir_gcm.c jit/ir/ir_ra.c jit/ir/ir_save.c \
56-
jit/ir/ir_dump.c jit/ir/ir_gdb.c jit/ir/ir_perf.c jit/ir/ir_check.c \
57-
jit/ir/ir_patch.c jit/ir/ir_emit.c"
55+
jit/ir/ir_cfg.c jit/ir/ir_sccp.c jit/ir/ir_gcm.c jit/ir/ir_ra.c jit/ir/ir_save.c \
56+
jit/ir/ir_dump.c jit/ir/ir_gdb.c jit/ir/ir_perf.c jit/ir/ir_check.c \
57+
jit/ir/ir_patch.c jit/ir/ir_emit.c"
5858

5959
dnl Find out which ABI we are using.
6060
case $host_alias in
@@ -323,21 +323,21 @@ int main(void) {
323323
LIBS="$LIBS_save"
324324

325325
PHP_NEW_EXTENSION(opcache,
326-
ZendAccelerator.c \
327-
zend_accelerator_blacklist.c \
328-
zend_accelerator_debug.c \
329-
zend_accelerator_hash.c \
330-
zend_accelerator_module.c \
331-
zend_persist.c \
332-
zend_persist_calc.c \
333-
zend_file_cache.c \
334-
zend_shared_alloc.c \
335-
zend_accelerator_util_funcs.c \
336-
shared_alloc_shm.c \
337-
shared_alloc_mmap.c \
338-
shared_alloc_posix.c \
339-
$ZEND_JIT_SRC,
340-
shared,,"-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 ${JIT_CFLAGS}",,yes)
326+
ZendAccelerator.c \
327+
zend_accelerator_blacklist.c \
328+
zend_accelerator_debug.c \
329+
zend_accelerator_hash.c \
330+
zend_accelerator_module.c \
331+
zend_persist.c \
332+
zend_persist_calc.c \
333+
zend_file_cache.c \
334+
zend_shared_alloc.c \
335+
zend_accelerator_util_funcs.c \
336+
shared_alloc_shm.c \
337+
shared_alloc_mmap.c \
338+
shared_alloc_posix.c \
339+
$ZEND_JIT_SRC,
340+
shared,,"-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 ${JIT_CFLAGS}",,yes)
341341

342342
PHP_ADD_EXTENSION_DEP(opcache, pcre)
343343

‎ext/standard/config.m4

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,33 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
1212
1313
int main(int argc, char **argv)
1414
{
15-
char *filename = tmpnam(NULL);
16-
char buffer[64];
17-
int result = 0;
18-
19-
FILE *fp = fopen(filename, "wb");
20-
if (NULL == fp)
21-
return 0;
22-
fputs("line 1\n", fp);
23-
fputs("line 2\n", fp);
24-
fclose(fp);
25-
26-
fp = fopen(filename, "rb+");
27-
if (NULL == fp)
28-
return 0;
29-
fgets(buffer, sizeof(buffer), fp);
30-
fputs("line 3\n", fp);
31-
rewind(fp);
32-
fgets(buffer, sizeof(buffer), fp);
33-
if (0 != strcmp(buffer, "line 1\n"))
34-
result = 1;
35-
fgets(buffer, sizeof(buffer), fp);
36-
if (0 != strcmp(buffer, "line 3\n"))
37-
result = 1;
38-
fclose(fp);
39-
unlink(filename);
40-
41-
exit(result);
15+
char *filename = tmpnam(NULL);
16+
char buffer[64];
17+
int result = 0;
18+
19+
FILE *fp = fopen(filename, "wb");
20+
if (NULL == fp)
21+
return 0;
22+
fputs("line 1\n", fp);
23+
fputs("line 2\n", fp);
24+
fclose(fp);
25+
26+
fp = fopen(filename, "rb+");
27+
if (NULL == fp)
28+
return 0;
29+
fgets(buffer, sizeof(buffer), fp);
30+
fputs("line 3\n", fp);
31+
rewind(fp);
32+
fgets(buffer, sizeof(buffer), fp);
33+
if (0 != strcmp(buffer, "line 1\n"))
34+
result = 1;
35+
fgets(buffer, sizeof(buffer), fp);
36+
if (0 != strcmp(buffer, "line 3\n"))
37+
result = 1;
38+
fclose(fp);
39+
unlink(filename);
40+
41+
exit(result);
4242
}
4343
]])],[
4444
ac_cv_flush_io=no
@@ -81,10 +81,10 @@ if test "$PHP_EXTERNAL_LIBCRYPT" != "no"; then
8181
8282
int main(void) {
8383
#ifdef HAVE_CRYPT
84-
char *encrypted = crypt("rasmuslerdorf","rl");
85-
return !encrypted || strcmp(encrypted,"rl.3StKT.4T8M");
84+
char *encrypted = crypt("rasmuslerdorf","rl");
85+
return !encrypted || strcmp(encrypted,"rl.3StKT.4T8M");
8686
#else
87-
return 1;
87+
return 1;
8888
#endif
8989
}]])],[
9090
ac_cv_crypt_des=yes
@@ -109,10 +109,10 @@ int main(void) {
109109
110110
int main(void) {
111111
#ifdef HAVE_CRYPT
112-
char *encrypted = crypt("rasmuslerdorf","_J9..rasm");
113-
return !encrypted || strcmp(encrypted,"_J9..rasmBYk8r9AiWNc");
112+
char *encrypted = crypt("rasmuslerdorf","_J9..rasm");
113+
return !encrypted || strcmp(encrypted,"_J9..rasmBYk8r9AiWNc");
114114
#else
115-
return 1;
115+
return 1;
116116
#endif
117117
}]])],[
118118
ac_cv_crypt_ext_des=yes
@@ -137,20 +137,20 @@ int main(void) {
137137
138138
int main(void) {
139139
#ifdef HAVE_CRYPT
140-
char salt[15], answer[40];
141-
char *encrypted;
142-
143-
salt[0]='$'; salt[1]='1'; salt[2]='$';
144-
salt[3]='r'; salt[4]='a'; salt[5]='s';
145-
salt[6]='m'; salt[7]='u'; salt[8]='s';
146-
salt[9]='l'; salt[10]='e'; salt[11]='$';
147-
salt[12]='\0';
148-
strcpy(answer,salt);
149-
strcat(answer,"rISCgZzpwk3UhDidwXvin0");
150-
encrypted = crypt("rasmuslerdorf",salt);
151-
return !encrypted || strcmp(encrypted,answer);
140+
char salt[15], answer[40];
141+
char *encrypted;
142+
143+
salt[0]='$'; salt[1]='1'; salt[2]='$';
144+
salt[3]='r'; salt[4]='a'; salt[5]='s';
145+
salt[6]='m'; salt[7]='u'; salt[8]='s';
146+
salt[9]='l'; salt[10]='e'; salt[11]='$';
147+
salt[12]='\0';
148+
strcpy(answer,salt);
149+
strcat(answer,"rISCgZzpwk3UhDidwXvin0");
150+
encrypted = crypt("rasmuslerdorf",salt);
151+
return !encrypted || strcmp(encrypted,answer);
152152
#else
153-
return 1;
153+
return 1;
154154
#endif
155155
}]])],[
156156
ac_cv_crypt_md5=yes
@@ -175,17 +175,17 @@ int main(void) {
175175
176176
int main(void) {
177177
#ifdef HAVE_CRYPT
178-
char salt[30], answer[70];
179-
char *encrypted;
180-
181-
salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0';
182-
strcat(salt,"rasmuslerd............");
183-
strcpy(answer,salt);
184-
strcpy(&answer[29],"nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra");
185-
encrypted = crypt("rasmuslerdorf",salt);
186-
return !encrypted || strcmp(encrypted,answer);
178+
char salt[30], answer[70];
179+
char *encrypted;
180+
181+
salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0';
182+
strcat(salt,"rasmuslerd............");
183+
strcpy(answer,salt);
184+
strcpy(&answer[29],"nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra");
185+
encrypted = crypt("rasmuslerdorf",salt);
186+
return !encrypted || strcmp(encrypted,answer);
187187
#else
188-
return 1;
188+
return 1;
189189
#endif
190190
}]])],[
191191
ac_cv_crypt_blowfish=yes
@@ -210,16 +210,16 @@ int main(void) {
210210
211211
int main(void) {
212212
#ifdef HAVE_CRYPT
213-
char salt[21], answer[21+86];
214-
char *encrypted;
215-
216-
strcpy(salt,"\$6\$rasmuslerdorf\$");
217-
strcpy(answer, salt);
218-
strcat(answer, "EeHCRjm0bljalWuALHSTs1NB9ipEiLEXLhYeXdOpx22gmlmVejnVXFhd84cEKbYxCo.XuUTrW.RLraeEnsvWs/");
219-
encrypted = crypt("rasmuslerdorf",salt);
220-
return !encrypted || strcmp(encrypted,answer);
213+
char salt[21], answer[21+86];
214+
char *encrypted;
215+
216+
strcpy(salt,"\$6\$rasmuslerdorf\$");
217+
strcpy(answer, salt);
218+
strcat(answer, "EeHCRjm0bljalWuALHSTs1NB9ipEiLEXLhYeXdOpx22gmlmVejnVXFhd84cEKbYxCo.XuUTrW.RLraeEnsvWs/");
219+
encrypted = crypt("rasmuslerdorf",salt);
220+
return !encrypted || strcmp(encrypted,answer);
221221
#else
222-
return 1;
222+
return 1;
223223
#endif
224224
}]])],[
225225
ac_cv_crypt_sha512=yes
@@ -244,16 +244,16 @@ int main(void) {
244244
245245
int main(void) {
246246
#ifdef HAVE_CRYPT
247-
char salt[21], answer[21+43];
248-
char *encrypted;
249-
250-
strcpy(salt,"\$5\$rasmuslerdorf\$");
251-
strcpy(answer, salt);
252-
strcat(answer, "cFAm2puLCujQ9t.0CxiFIIvFi4JyQx5UncCt/xRIX23");
253-
encrypted = crypt("rasmuslerdorf",salt);
254-
return !encrypted || strcmp(encrypted,answer);
247+
char salt[21], answer[21+43];
248+
char *encrypted;
249+
250+
strcpy(salt,"\$5\$rasmuslerdorf\$");
251+
strcpy(answer, salt);
252+
strcat(answer, "cFAm2puLCujQ9t.0CxiFIIvFi4JyQx5UncCt/xRIX23");
253+
encrypted = crypt("rasmuslerdorf",salt);
254+
return !encrypted || strcmp(encrypted,answer);
255255
#else
256-
return 1;
256+
return 1;
257257
#endif
258258
}]])],[
259259
ac_cv_crypt_sha256=yes

0 commit comments

Comments
 (0)