diff options
| author | Stefan Fritsch <sf@apache.org> | 2010-11-06 21:47:39 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2010-11-06 21:47:39 +0000 |
| commit | 50efd54644b1235df011fb667b72e91c413165bc (patch) | |
| tree | 00a8bcf4842f9ca5923795dcdc225ad4a650c647 | |
| parent | 1f7417309f15eaa4e4c712c6223cd38d388031ad (diff) | |
| download | httpd-50efd54644b1235df011fb667b72e91c413165bc.tar.gz | |
Netware build fixes
Submitted by: NormW <normw gknw net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032163 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | NWGNUmakefile | 5 | ||||
| -rw-r--r-- | server/util_expr_eval.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile index f91b8f424e..2a9623e783 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -71,6 +71,7 @@ XINCDIRS += \ $(STDMOD)/mappers \ $(STDMOD)/proxy \ $(STDMOD)/ssl \ + $(AP_WORK)/server \ $(AP_WORK)/server/mpm/netware \ $(PCRE) \ $(NWOS) \ @@ -269,7 +270,9 @@ FILES_nlm_objs = \ $(OBJDIR)/util_charset.o \ $(OBJDIR)/util_cookies.o \ $(OBJDIR)/util_debug.o \ - $(OBJDIR)/util_expr.o \ + $(OBJDIR)/util_expr_eval.o \ + $(OBJDIR)/util_expr_parse.o \ + $(OBJDIR)/util_expr_scan.o \ $(OBJDIR)/util_filter.o \ $(OBJDIR)/util_md5.o \ $(OBJDIR)/util_mutex.o \ diff --git a/server/util_expr_eval.c b/server/util_expr_eval.c index 8a74621f5c..bdefb076a1 100644 --- a/server/util_expr_eval.c +++ b/server/util_expr_eval.c @@ -884,8 +884,8 @@ static const char *misc_var_names[] = { static const char *misc_var_fn(ap_expr_eval_ctx *ctx, const void *data) { apr_time_exp_t tm; - apr_time_exp_lt(&tm, apr_time_now()); int index = ((const char **)data - misc_var_names); + apr_time_exp_lt(&tm, apr_time_now()); switch (index) { case 0: |