From: Sergey Kandaurov Date: Mon, 8 Jun 2026 14:13:24 +0000 (+0400) Subject: Style X-Git-Tag: release-1.31.2~14 X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/NGINX-js-1660x332.png%20%22NGINX%20JavaScript%20Banner%22?a=commitdiff_plain;h=455fbf8c45385168bafd2077fac0c214521543fc;p=nginx.git Style --- diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c index 0c905eff3..deb8733c7 100644 --- a/src/event/modules/ngx_kqueue_module.c +++ b/src/event/modules/ngx_kqueue_module.c @@ -438,8 +438,8 @@ ngx_kqueue_set_event(ngx_event_t *ev, ngx_int_t filter, ngx_uint_t flags) if (filter == EVFILT_VNODE) { kev->fflags = NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND |NOTE_ATTRIB|NOTE_RENAME -#if (__FreeBSD__ == 4 && __FreeBSD_version >= 430000) \ - || __FreeBSD_version >= 500018 +#if (__FreeBSD__ == 4 && __FreeBSD_version >= 430000) \ + || __FreeBSD_version >= 500018 |NOTE_REVOKE #endif ; diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c index 573894629..e11694586 100644 --- a/src/event/ngx_event_openssl.c +++ b/src/event/ngx_event_openssl.c @@ -1171,7 +1171,7 @@ ngx_ssl_crl(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *crl) static ngx_inline ngx_int_t ngx_ssl_cert_already_in_hash(void) { -#if !(OPENSSL_VERSION_NUMBER >= 0x1010009fL \ +#if !(OPENSSL_VERSION_NUMBER >= 0x1010009fL \ || LIBRESSL_VERSION_NUMBER >= 0x3050000fL) u_long error; diff --git a/src/http/modules/ngx_http_upstream_least_time_module.c b/src/http/modules/ngx_http_upstream_least_time_module.c index 645d01b0d..4020ec47d 100644 --- a/src/http/modules/ngx_http_upstream_least_time_module.c +++ b/src/http/modules/ngx_http_upstream_least_time_module.c @@ -663,4 +663,3 @@ ngx_http_upstream_least_time(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) return ngx_conf_set_enum_slot(cf, cmd, conf); } - diff --git a/src/os/unix/ngx_freebsd_init.c b/src/os/unix/ngx_freebsd_init.c index 1823f0281..f732637d1 100644 --- a/src/os/unix/ngx_freebsd_init.c +++ b/src/os/unix/ngx_freebsd_init.c @@ -162,8 +162,8 @@ ngx_os_specific_init(ngx_log_t *log) * to allow an old binary to run correctly on an updated FreeBSD system. */ -#if (__FreeBSD__ == 4 && __FreeBSD_version >= 460102) \ - || __FreeBSD_version == 460002 || __FreeBSD_version >= 500039 +#if (__FreeBSD__ == 4 && __FreeBSD_version >= 460102) \ + || __FreeBSD_version == 460002 || __FreeBSD_version >= 500039 /* a new syscall without the bug */ diff --git a/src/stream/ngx_stream_upstream_least_time_module.c b/src/stream/ngx_stream_upstream_least_time_module.c index 361a89c07..630372980 100644 --- a/src/stream/ngx_stream_upstream_least_time_module.c +++ b/src/stream/ngx_stream_upstream_least_time_module.c @@ -664,4 +664,3 @@ ngx_stream_upstream_least_time(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) return ngx_conf_set_enum_slot(cf, cmd, conf); } -