Change the priority ordering for multiple -prefer switches

[nmh] / sbr / fmt_compile.c

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index 389e16c491d62460dfa602e0e094e88b223e8bf9..3930f8ca8563cc9904fe8a72a77461193a3d8dad 100644 (file)
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -46,6 +46,7 @@
 #include <h/fmt_compile.h>
 #include <h/mts.h>
 #include <h/utils.h>
+#include "terminal.h"
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
@@ -354,7 +355,7 @@ lookup(char *name)
 
        t++;
     }
-    return (struct ftable *) 0;
+    return NULL;
 }
 
 
@@ -572,7 +573,7 @@ do_name(char *sp, int preprocess)
     case FT_GETMYMBOX:
     case FT_GETMYADDR:
        if (!primed) {
-           ismymbox ((struct mailname *) 0);
+           ismymbox(NULL);
            primed++;
        }
        /* FALLTHRU */
@@ -732,7 +733,7 @@ do_func(char *sp)
     }
 
     case TF_NOW:
-       LV(t->f_type, time((time_t *) 0));
+       LV(t->f_type, time(NULL));
        break;
 
     case TF_EXPR_SV: