3 files changed, 5 insertions, 2 deletions
diff --git a/src/os/unix/ngx_freebsd_rfork_thread.h b/src/os/unix/ngx_freebsd_rfork_thread.h
index 215d2dc86..79e748a00 100644
--- a/src/os/unix/ngx_freebsd_rfork_thread.h
+++ b/src/os/unix/ngx_freebsd_rfork_thread.h
@@ -14,7 +14,6 @@
 
 typedef pid_t  ngx_tid_t;
 
-#undef ngx_log_pid
 #define ngx_log_pid    ngx_thread_self()
 #define ngx_log_tid    0
 
diff --git a/src/os/unix/ngx_process.h b/src/os/unix/ngx_process.h
index 06ff21cfe..a34ca6142 100644
--- a/src/os/unix/ngx_process.h
+++ b/src/os/unix/ngx_process.h
@@ -51,7 +51,11 @@ typedef struct {
 
 
 #define ngx_getpid   getpid
+
+#ifndef ngx_log_pid
 #define ngx_log_pid  ngx_pid
+#endif
+
 
 ngx_pid_t ngx_spawn_process(ngx_cycle_t *cycle,
     ngx_spawn_proc_pt proc, void *data, char *name, ngx_int_t respawn);
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index 97475e60d..029de436f 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -703,7 +703,7 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data)
 
     for ( ;; ) {
         if (ngx_exiting
-            && ngx_event_timer_rbtree == &ngx_event_timer_sentinel)
+            && ngx_event_timer_rbtree.root == ngx_event_timer_rbtree.sentinel)
         {
             ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");