comparison src/core/ngx_log.h @ 635:e67b227c8dbb default tip

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:07:55 +0400
parents 016632f0fb18
children
comparison
equal deleted inserted replaced
578:f3a9e57d2e17 635:e67b227c8dbb
66 #define NGX_MAX_ERROR_STR 2048 66 #define NGX_MAX_ERROR_STR 2048
67 67
68 68
69 /*********************************/ 69 /*********************************/
70 70
71 #if (NGX_HAVE_GCC_VARIADIC_MACROS) 71 #if (NGX_HAVE_C99_VARIADIC_MACROS)
72
73 #define NGX_HAVE_VARIADIC_MACROS 1
74
75 #define ngx_log_error(level, log, ...) \
76 if ((log)->log_level >= level) ngx_log_error_core(level, log, __VA_ARGS__)
77
78 void ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err,
79 const char *fmt, ...);
80
81 #define ngx_log_debug(level, log, ...) \
82 if ((log)->log_level & level) \
83 ngx_log_error_core(NGX_LOG_DEBUG, log, __VA_ARGS__)
84
85 /*********************************/
86
87 #elif (NGX_HAVE_GCC_VARIADIC_MACROS)
72 88
73 #define NGX_HAVE_VARIADIC_MACROS 1 89 #define NGX_HAVE_VARIADIC_MACROS 1
74 90
75 #define ngx_log_error(level, log, args...) \ 91 #define ngx_log_error(level, log, args...) \
76 if ((log)->log_level >= level) ngx_log_error_core(level, log, args) 92 if ((log)->log_level >= level) ngx_log_error_core(level, log, args)
79 const char *fmt, ...); 95 const char *fmt, ...);
80 96
81 #define ngx_log_debug(level, log, args...) \ 97 #define ngx_log_debug(level, log, args...) \
82 if ((log)->log_level & level) \ 98 if ((log)->log_level & level) \
83 ngx_log_error_core(NGX_LOG_DEBUG, log, args) 99 ngx_log_error_core(NGX_LOG_DEBUG, log, args)
84
85 /*********************************/
86
87 #elif (NGX_HAVE_C99_VARIADIC_MACROS)
88
89 #define NGX_HAVE_VARIADIC_MACROS 1
90
91 #define ngx_log_error(level, log, ...) \
92 if ((log)->log_level >= level) ngx_log_error_core(level, log, __VA_ARGS__)
93
94 void ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err,
95 const char *fmt, ...);
96
97 #define ngx_log_debug(level, log, ...) \
98 if ((log)->log_level & level) \
99 ngx_log_error_core(NGX_LOG_DEBUG, log, __VA_ARGS__)
100 100
101 /*********************************/ 101 /*********************************/
102 102
103 #else /* NO VARIADIC MACROS */ 103 #else /* NO VARIADIC MACROS */
104 104