Mercurial > hg > nginx-vendor-current

diff src/os/unix/ngx_setproctitle.h @ 64:5db440287648 NGINX_0_1_32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.1.32 *) Bugfix: the arguments were omitted in the redirects, issued by the "rewrite" directive; bug appeared in 0.1.29. *) Feature: the "if" directive supports the captures in regular expressions. *) Feature: the "set" directive supports the variables and the captures of regular expressions. *) Feature: the "X-Accel-Redirect" response header line is supported in proxy and FastCGI mode.
author Igor Sysoev <http://sysoev.ru>
date Thu, 19 May 2005 00:00:00 +0400
parents b55cbf18157e
children c04fa65fe604
line wrap: on
line diff
--- a/src/os/unix/ngx_setproctitle.h
+++ b/src/os/unix/ngx_setproctitle.h
@@ -16,30 +16,36 @@
 #define ngx_setproctitle           setproctitle
 
 
-#elif !defined NGX_SETPROCTITLE_USES_ENV
+#else /* !NGX_HAVE_SETPROCTITLE */
 
-#define NGX_SETPROCTITLE_USES_ENV  1
+#if !defined NGX_SETPROCTITLE_USES_ENV
 
 #if (NGX_SOLARIS)
 
+#define NGX_SETPROCTITLE_USES_ENV  1
 #define NGX_SETPROCTITLE_PAD       ' '
 
-#elif (NGX_LINUX) || (NGX_DARWIN)
-
-#define NGX_SETPROCTITLE_PAD       '\0'
-
-#endif
-
 ngx_int_t ngx_init_setproctitle(ngx_log_t *log);
 void ngx_setproctitle(char *title);
 
+#elif (NGX_LINUX) || (NGX_DARWIN)
 
-#else /* !NGX_SETPROCTITLE_USES_ENV */
+#define NGX_SETPROCTITLE_USES_ENV  1
+#define NGX_SETPROCTITLE_PAD       '\0'
+
+ngx_int_t ngx_init_setproctitle(ngx_log_t *log);
+void ngx_setproctitle(char *title);
+
+#else
 
 #define ngx_init_setproctitle(log)
 #define ngx_setproctitle(title)
 
-#endif
+#endif /* OSes */
+
+#endif /* NGX_SETPROCTITLE_USES_ENV */
+
+#endif /* NGX_HAVE_SETPROCTITLE */
 
 
 #endif /* _NGX_SETPROCTITLE_H_INCLUDED_ */