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

diff --git a/NWGNUmakefile b/NWGNUmakefile
index f91b8f424e9ed2be0d9b97a6e5b5986666115abe..2a9623e7839c6cc8bd815287e8de96eaa28002ac 100644 (file)
--- 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 8a74621f5c5ea18521a85b52f31d3b82b6b43279..bdefb076a19dd246d633bbd9622f49d72c6c7500 100644 (file)
--- 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: