Browse Source

Latest update - 7449

master
Hakase 1 month ago
parent
commit
1c72e66e95
Signed by: Hakase <hakase@hakase.app> GPG Key ID: BB2821A9E0DF48C9

+ 2
- 2
docs/text/LICENSE View File

@@ -1,6 +1,6 @@
1 1
 /* 
2
- * Copyright (C) 2002-2018 Igor Sysoev
3
- * Copyright (C) 2011-2018 Nginx, Inc.
2
+ * Copyright (C) 2002-2019 Igor Sysoev
3
+ * Copyright (C) 2011-2019 Nginx, Inc.
4 4
  * All rights reserved.
5 5
  *
6 6
  * Redistribution and use in source and binary forms, with or without

+ 0
- 2
src/event/modules/ngx_eventport_module.c View File

@@ -250,9 +250,7 @@ ngx_eventport_init(ngx_cycle_t *cycle, ngx_msec_t timer)
250 250
 
251 251
         ngx_memzero(&sev, sizeof(struct sigevent));
252 252
         sev.sigev_notify = SIGEV_PORT;
253
-#if !(NGX_TEST_BUILD_EVENTPORT)
254 253
         sev.sigev_value.sival_ptr = &pn;
255
-#endif
256 254
 
257 255
         if (timer_create(CLOCK_REALTIME, &sev, &event_timer) == -1) {
258 256
             ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,

+ 1
- 1
src/os/unix/ngx_file_aio_read.c View File

@@ -110,7 +110,7 @@ ngx_file_aio_read(ngx_file_t *file, u_char *buf, size_t size, off_t offset,
110 110
 #if (NGX_HAVE_KQUEUE)
111 111
     aio->aiocb.aio_sigevent.sigev_notify_kqueue = ngx_kqueue;
112 112
     aio->aiocb.aio_sigevent.sigev_notify = SIGEV_KEVENT;
113
-    aio->aiocb.aio_sigevent.sigev_value.sigval_ptr = ev;
113
+    aio->aiocb.aio_sigevent.sigev_value.sival_ptr = ev;
114 114
 #endif
115 115
     ev->handler = ngx_file_aio_event_handler;
116 116
 

+ 6
- 0
src/os/unix/ngx_freebsd_config.h View File

@@ -89,8 +89,14 @@
89 89
 
90 90
 
91 91
 #if (NGX_HAVE_FILE_AIO)
92
+
92 93
 #include <aio.h>
93 94
 typedef struct aiocb  ngx_aiocb_t;
95
+
96
+#if (__FreeBSD_version < 700005 && !defined __DragonFly__)
97
+#define sival_ptr     sigval_ptr
98
+#endif
99
+
94 100
 #endif
95 101
 
96 102
 

Loading…
Cancel
Save