Core: hide "struct ngx_quic_connection_s" and further reduce diffs.

As with the previous change, it became feasible with feec2cc762f6
that removes ngx_quic_connection_t from ngx_connection_s.

diff --git a/src/core/ngx_core.h b/src/core/ngx_core.h
index ade35be7373af17f5d70da1befbecd116678171c..8e6c756c9df624420d295391ec3cedca83b972d2 100644 (file)
--- a/src/core/ngx_core.h
+++ b/src/core/ngx_core.h
@@ -12,25 +12,24 @@
 #include <ngx_config.h>
 
 
-typedef struct ngx_module_s           ngx_module_t;
-typedef struct ngx_conf_s             ngx_conf_t;
-typedef struct ngx_cycle_s            ngx_cycle_t;
-typedef struct ngx_pool_s             ngx_pool_t;
-typedef struct ngx_chain_s            ngx_chain_t;
-typedef struct ngx_log_s              ngx_log_t;
-typedef struct ngx_open_file_s        ngx_open_file_t;
-typedef struct ngx_command_s          ngx_command_t;
-typedef struct ngx_file_s             ngx_file_t;
-typedef struct ngx_event_s            ngx_event_t;
-typedef struct ngx_event_aio_s        ngx_event_aio_t;
-typedef struct ngx_connection_s       ngx_connection_t;
-typedef struct ngx_thread_task_s      ngx_thread_task_t;
-typedef struct ngx_ssl_s              ngx_ssl_t;
-typedef struct ngx_proxy_protocol_s   ngx_proxy_protocol_t;
-typedef struct ngx_quic_connection_s  ngx_quic_connection_t;
-typedef struct ngx_quic_stream_s      ngx_quic_stream_t;
-typedef struct ngx_ssl_connection_s   ngx_ssl_connection_t;
-typedef struct ngx_udp_connection_s   ngx_udp_connection_t;
+typedef struct ngx_module_s          ngx_module_t;
+typedef struct ngx_conf_s            ngx_conf_t;
+typedef struct ngx_cycle_s           ngx_cycle_t;
+typedef struct ngx_pool_s            ngx_pool_t;
+typedef struct ngx_chain_s           ngx_chain_t;
+typedef struct ngx_log_s             ngx_log_t;
+typedef struct ngx_open_file_s       ngx_open_file_t;
+typedef struct ngx_command_s         ngx_command_t;
+typedef struct ngx_file_s            ngx_file_t;
+typedef struct ngx_event_s           ngx_event_t;
+typedef struct ngx_event_aio_s       ngx_event_aio_t;
+typedef struct ngx_connection_s      ngx_connection_t;
+typedef struct ngx_thread_task_s     ngx_thread_task_t;
+typedef struct ngx_ssl_s             ngx_ssl_t;
+typedef struct ngx_proxy_protocol_s  ngx_proxy_protocol_t;
+typedef struct ngx_quic_stream_s     ngx_quic_stream_t;
+typedef struct ngx_ssl_connection_s  ngx_ssl_connection_t;
+typedef struct ngx_udp_connection_s  ngx_udp_connection_t;
 
 typedef void (*ngx_event_handler_pt)(ngx_event_t *ev);
 typedef void (*ngx_connection_handler_pt)(ngx_connection_t *c);

diff --git a/src/event/ngx_event_quic.c b/src/event/ngx_event_quic.c
index 97ffd96c4b498807c4a673e5f7503dcf51caf2b8..edd1c78929579ba4f41f766306036d23ed6dbed6 100644 (file)
--- a/src/event/ngx_event_quic.c
+++ b/src/event/ngx_event_quic.c
@@ -114,7 +114,7 @@ typedef struct {
 } ngx_quic_send_ctx_t;
 
 
-struct ngx_quic_connection_s {
+typedef struct {
     ngx_udp_connection_t              udp;
 
     uint32_t                          version;
@@ -182,7 +182,7 @@ struct ngx_quic_connection_s {
     unsigned                          in_retry:1;
     unsigned                          initialized:1;
     unsigned                          validated:1;
-};
+} ngx_quic_connection_t;
 
 
 typedef struct {