From 6f134cc2751846c7fb64e8862dfe8d57185872af Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 23 May 2006 14:54:58 +0000
Subject: nginx-0.3.47-RELEASE import

    *) Feature: the "upstream" directive.

    *) Change: now the "\" escape symbol in the "\"" and "\'" pairs in the
       SSI command is always removed.
---
 src/core/ngx_conf_file.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/core/ngx_conf_file.h')

diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h
index 8f84e36a7..17c24c725 100644
--- a/src/core/ngx_conf_file.h
+++ b/src/core/ngx_conf_file.h
@@ -61,7 +61,7 @@
 
 
 #define NGX_CONF_OK          NULL
-#define NGX_CONF_ERROR       (char *) -1
+#define NGX_CONF_ERROR       (void *) -1
 
 #define NGX_CONF_BLOCK_START 1
 #define NGX_CONF_BLOCK_DONE  2
-- 
cgit