On Tuesday 23 November 2010, Gregg L. Smith wrote:
> Here we go, cannot test beyond libhttp
> warning aren't a big deal but showing them anyway with errors
Thanks. Please try the attached patch in addition to all changes so
far.
diff --git a/include/http_config.h b/include/http_config.h
index 66f73ba..6c09410 100644
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -1259,7 +1259,7 @@ AP_DECLARE_HOOK(void,optional_fn_retrieve,(void))
* @param data The address of the pointer
* @return APR_SUCCESS
*/
-AP_DECLARE(apr_status_t) ap_pool_cleanup_set_null(void *data);
+AP_DECLARE_NONSTD(apr_status_t) ap_pool_cleanup_set_null(void *data);
#ifdef __cplusplus
}
diff --git a/server/util.c b/server/util.c
index bafa68a..3c6630c 100644
--- a/server/util.c
+++ b/server/util.c
@@ -2249,7 +2249,7 @@ AP_DECLARE(int) ap_request_has_body(request_rec *r)
return has_body;
}
-AP_DECLARE(apr_status_t) ap_pool_cleanup_set_null(void *data_)
+AP_DECLARE_NONSTD(apr_status_t) ap_pool_cleanup_set_null(void *data_)
{
void **ptr = (void **)data_;
*ptr = NULL;
diff --git a/server/util_expr_parse.c b/server/util_expr_parse.c
index e1b656c..59f7aec 100644
--- a/server/util_expr_parse.c
+++ b/server/util_expr_parse.c
@@ -111,7 +111,7 @@
enum yytokentype {
T_TRUE = 258,
T_FALSE = 259,
- ERROR = 260,
+ T_ERROR = 260,
T_DIGIT = 261,
T_ID = 262,
T_STRING = 263,
@@ -502,8 +502,8 @@ static const yytype_uint8 yyrline[] =
First, the terminals, then, starting at YYNTOKENS, nonterminals. */
static const char *const yytname[] =
{
- "$end", "error", "$undefined", "T_TRUE", "T_FALSE", "ERROR", "T_DIGIT",
- "T_ID", "T_STRING", "T_REGEX", "T_REGEX_I", "T_REGEX_BACKREF",
+ "$end", "error", "$undefined", "T_TRUE", "T_FALSE", "T_ERROR",
+ "T_DIGIT", "T_ID", "T_STRING", "T_REGEX", "T_REGEX_I", "T_REGEX_BACKREF",
"T_OP_UNARY", "T_OP_BINARY", "T_STR_BEGIN", "T_STR_END", "T_VAR_BEGIN",
"T_VAR_END", "T_OP_EQ", "T_OP_NE", "T_OP_LT", "T_OP_LE", "T_OP_GT",
"T_OP_GE", "T_OP_REG", "T_OP_NRE", "T_OP_IN", "T_OP_STR_EQ",
diff --git a/server/util_expr_parse.h b/server/util_expr_parse.h
index f0f3431..b75076d 100644
--- a/server/util_expr_parse.h
+++ b/server/util_expr_parse.h
@@ -41,7 +41,7 @@
enum yytokentype {
T_TRUE = 258,
T_FALSE = 259,
- ERROR = 260,
+ T_ERROR = 260,
T_DIGIT = 261,
T_ID = 262,
T_STRING = 263,
diff --git a/server/util_expr_parse.y b/server/util_expr_parse.y
index 568597f..3810258 100644
--- a/server/util_expr_parse.y
+++ b/server/util_expr_parse.y
@@ -41,7 +41,7 @@
%token T_TRUE
%token T_FALSE
-%token <cpVal> ERROR
+%token <cpVal> T_ERROR
%token <cpVal> T_DIGIT
%token <cpVal> T_ID
@@ -107,7 +107,7 @@ int ap_expr_yylex(YYSTYPE *lvalp, void *scanner);
%%
root : expr { ctx->expr = $1; }
- | ERROR { YYABORT; }
+ | T_ERROR { YYABORT; }
;
expr : T_TRUE { $$ = ap_expr_make(op_True, NULL, NULL, ctx); }
diff --git a/server/util_expr_scan.c b/server/util_expr_scan.c
index a366134..d7b1483 100644
--- a/server/util_expr_scan.c
+++ b/server/util_expr_scan.c
@@ -599,7 +599,7 @@ static yyconst flex_int16_t yy_chk[319] =
#define YY_EXTRA_TYPE ap_expr_parse_ctx*
-#define PERROR(msg) yyextra->error2 = msg ; return ERROR;
+#define PERROR(msg) yyextra->error2 = msg ; return T_ERROR;
#define str_ptr (yyextra->scan_ptr)
#define str_buf (yyextra->scan_buf)
diff --git a/server/util_expr_scan.l b/server/util_expr_scan.l
index 79bdbc1..6ca4afe 100644
--- a/server/util_expr_scan.l
+++ b/server/util_expr_scan.l
@@ -60,7 +60,7 @@
#define YY_EXTRA_TYPE ap_expr_parse_ctx*
-#define PERROR(msg) yyextra->error2 = msg ; return ERROR;
+#define PERROR(msg) yyextra->error2 = msg ; return T_ERROR;
#define str_ptr (yyextra->scan_ptr)
#define str_buf (yyextra->scan_buf)
