summaryrefslogtreecommitdiffhomepage
path: root/src/os/unix/freebsd
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/os/unix/freebsd/ngx_rfork_thread.c (renamed from src/os/freebsd/ngx_os_thread.c)4
-rw-r--r--src/os/unix/freebsd/ngx_rfork_thread.h (renamed from src/os/freebsd/ngx_os_thread.h)0
-rw-r--r--src/os/unix/freebsd/ngx_sendfile.c (renamed from src/os/unix/ngx_sendfile.c)6
3 files changed, 6 insertions, 4 deletions
diff --git a/src/os/freebsd/ngx_os_thread.c b/src/os/unix/freebsd/ngx_rfork_thread.c
index f40956e20..acd5ec6e2 100644
--- a/src/os/freebsd/ngx_os_thread.c
+++ b/src/os/unix/freebsd/ngx_rfork_thread.c
@@ -17,7 +17,7 @@ int *__error()
}
-int ngx_create_os_thread(ngx_os_tid_t *tid, void *stack,
+int ngx_create_thread(ngx_os_tid_t *tid, void *stack,
int (*func)(void *arg), void *arg, ngx_log_t log)
{
int id, err;
@@ -35,7 +35,7 @@ int ngx_create_os_thread(ngx_os_tid_t *tid, void *stack,
}
-int ngx_create_os_thread_env(int n, size_t size, ngx_log_t log)
+int ngx_create_thread_env(int n, size_t size, ngx_log_t log)
{
char *addr;
diff --git a/src/os/freebsd/ngx_os_thread.h b/src/os/unix/freebsd/ngx_rfork_thread.h
index bd500e1a4..bd500e1a4 100644
--- a/src/os/freebsd/ngx_os_thread.h
+++ b/src/os/unix/freebsd/ngx_rfork_thread.h
diff --git a/src/os/unix/ngx_sendfile.c b/src/os/unix/freebsd/ngx_sendfile.c
index 2bc157361..31915e405 100644
--- a/src/os/unix/ngx_sendfile.c
+++ b/src/os/unix/freebsd/ngx_sendfile.c
@@ -1,6 +1,8 @@
#include <ngx_config.h>
#include <ngx_types.h>
+#include <ngx_file.h>
+#include <ngx_socket.h>
#include <ngx_errno.h>
#include <ngx_log.h>
#include <ngx_sendv.h>
@@ -56,8 +58,8 @@ int ngx_sendfile(ngx_socket_t s,
}
}
- ngx_log_debug(log, "ngx_sendfile: %d, @%qd %d:%qd" _
- rc _ offset _ nbytes _ *sent);
+ ngx_log_debug(log, "ngx_sendfile: %d, @%qd %qd:%d" _
+ rc _ offset _ *sent _ nbytes);
return 0;
}