com php-src: sync vim mode lines in main: main/SAPI.h main/explicit_bzero.c main/fopen_wrappers.h main/ht tp_status_codes.h main/php_compat.h
main/php_co ntent_types.h main/php_globals.h main/php_ini.h main/php_main.h main/php_network.h main/php_op en_temporary_file.h main/php_reentrancy.h
main/ph p_scandir.h main/php_syslog.h main/php_ticks.h main/php_variables.h main/rfc1867.h main/s nprintf.h main/spprintf.h

Commit: 384f0f8a4c91c3fa1c2de4786f971197a0d52ee7 Author: Anatol Belski <ab@php.net> Sun, 9 Jul 2017 11:35:55 +0200 Parents: e870edb1eebb1869fec62f76e4d0aed1448a5a18 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=384f0f8a4c91c3fa1c2de4786f971197a0d52ee7 Log: sync vim mode lines in main Changed paths: M main/SAPI.h M main/explicit_bzero.c M main/fopen_wrappers.h M main/http_status_codes.h M main/php_compat.h M main/php_content_types.h M main/php_globals.h M main/php_ini.h M main/php_main.h M main/php_network.h M main/php_open_temporary_file.h M main/php_reentrancy.h M main/php_scandir.h M main/php_syslog.h M main/php_ticks.h M main/php_variables.h M main/rfc1867.h M main/snprintf.h M main/spprintf.h Diff: diff --git a/main/SAPI.h b/main/SAPI.h index 6914ed4..1516702 100644 --- a/main/SAPI.h +++ b/main/SAPI.h @@ -327,4 +327,6 @@ END_EXTERN_C() * tab-width: 4 * c-basic-offset: 4 * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 */ diff --git a/main/explicit_bzero.c b/main/explicit_bzero.c index 6bea9e3..e99e082 100644 --- a/main/explicit_bzero.c +++ b/main/explicit_bzero.c @@ -41,3 +41,11 @@ PHPAPI void php_explicit_bzero(void *dst, size_t siz) __explicit_bzero_hook(dst, siz); } #endif +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 + */ diff --git a/main/fopen_wrappers..h b/main/fopen_wrappers.h index b3c4d7f..5e1544c 100644 --- a/main/fopen_wrappers.h +++ b/main/fopen_wrappers.h @@ -54,4 +54,6 @@ END_EXTERN_C() * tab-width: 4 * c-basic-offset: 4 * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 */ diff --git a/main/http_status_codes.h b/main/http_status_codes.h index 64306bd..a8417b6 100644 --- a/main/http_status_codes.h +++ b/main/http_status_codes.h @@ -82,3 +82,11 @@ static http_response_status_code_pair http_status_map[] = { static const size_t http_status_map_len = (sizeof(http_status_map) / sizeof(http_response_status_code_pair)) - 1; #endif /* HTTP_STATUS_CODES_H */ +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 + */ diff --git a/main/php_compat.h b/main/php_compat.h index 7c05022..f0b872d 100644 --- a/main/php_compat.h +++ b/main/php_compat.h @@ -376,3 +376,11 @@ #endif #endif +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 + */ diff --git a/main/php_content_types.h b/main/php_content_types.h index 6b5387f..cd01fe8 100644 --- a/main/php_content_types.h +++ b/main/php_content_types.h @@ -29,3 +29,11 @@ int php_startup_sapi_content_types(void); int php_setup_sapi_content_types(void); #endif /* PHP_CONTENT_TYPES_H */ +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 + */ diff --git a/main/php_globals.h b/main/php_globals.h index e039f32..d27f397 100644 --- a/main/php_globals.h +++ b/main/php_globals.h @@ -176,4 +176,6 @@ struct _php_core_globals { * tab-width: 4 * c-basic-offset: 4 * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 */ diff --git a/main/php_ini.h b/main/php_ini.h index 2ae90fe..e582def 100644 --- a/main/php_ini.h +++ b/main/php_ini.h @@ -89,3 +89,11 @@ END_EXTERN_C() #define php_ini_string zend_ini_string #endif /* PHP_INI_H */ +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 + */ diff --git a/main/php_main.h b/main/php_main.h index 2965048..ff342a1 100644 --- a/main/php_main.h +++ b/main/php_main.h @@ -56,3 +56,11 @@ extern int php_shutdown_environ(void); END_EXTERN_C() #endif +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 + */ diff --git a/main/php_network.h b/main/php_network.h index 5385fe1..ee02fd1 100644 --- a/main/php_network.h +++ b/main/php_network.h @@ -344,7 +344,9 @@ END_EXTERN_C() /* * Local variables: - * tab-width: 8 - * c-basic-offset: 8 + * tab-width: 4 + * c-basic-offset: 4 * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 */ diff --git a/main/php_open_temporary_file.h b/main/php_open_temporary_file.h index 0a9b257..fbafb33 100644 --- a/main/php_open_temporary_file..h +++ b/main/php_open_temporary_file.h @@ -32,3 +32,11 @@ PHPAPI const char *php_get_temporary_directory(void); END_EXTERN_C() #endif /* PHP_OPEN_TEMPORARY_FILE_H */ +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 + */ diff --git a/main/php_reentrancy..h b/main/php_reentrancy.h index 86f402d..f66f3c5 100644 --- a/main/php_reentrancy.h +++ b/main/php_reentrancy.h @@ -131,3 +131,11 @@ void reentrancy_shutdown(void); #endif #endif +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 + */ diff --git a/main/php_scandir.h b/main/php_scandir.h index 3e67e74..2e8773b 100644 --- a/main/php_scandir.h +++ b/main/php_scandir.h @@ -52,3 +52,11 @@ PHPAPI int php_alphasort(const struct dirent **a, const struct dirent **b); #endif #endif /* PHP_SCANDIR_H */ +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 + */ diff --git a/main/php_syslog.h b/main/php_syslog.h index 33f52a3..be68cc4 100644 --- a/main/php_syslog.h +++ b/main/php_syslog.h @@ -50,3 +50,11 @@ #endif #endif +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 + */ diff --git a/main/php_ticks.h b/main/php_ticks.h index b807b3e..5df8854 100644 --- a/main/php_ticks.h +++ b/main/php_ticks.h @@ -38,4 +38,6 @@ END_EXTERN_C() * tab-width: 4 * c-basic-offset: 4 * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 */ diff --git a/main/php_variables.h b/main/php_variables..h index af7254b..5fa38fa 100644 --- a/main/php_variables.h +++ b/main/php_variables.h @@ -48,3 +48,11 @@ END_EXTERN_C() #define NUM_TRACK_VARS 6 #endif /* PHP_VARIABLES_H */ +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 + */ diff --git a/main/rfc1867.h b/main/rfc1867.h index 637c325..5dc7926 100644 --- a/main/rfc1867.h +++ b/main/rfc1867.h @@ -89,3 +89,11 @@ SAPI_API void php_rfc1867_set_multibyte_callbacks( php_rfc1867_basename_t basename); #endif /* RFC1867_H */ +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 + */ diff --git a/main/snprintf.h b/main/snprintf.h index 7abf556..0216296 100644 --- a/main/snprintf.h +++ b/main/snprintf.h @@ -178,4 +178,6 @@ PHPAPI char * ap_php_conv_p2(u_wide_int num, int nbits, * tab-width: 4 * c-basic-offset: 4 * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 */ diff --git a/main/spprintf.h b/main/spprintf.h index 89f23f1..597d95b 100644 --- a/main/spprintf.h +++ b/main/spprintf.h @@ -40,4 +40,6 @@ END_EXTERN_C() * tab-width: 4 * c-basic-offset: 4 * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 */