Update README.developers with the correct version of autoconf we need.

[mmh] / sbr / fmt_compile.c

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index bcd7b3d..c49a6ea 100644 (file)
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -12,16 +12,10 @@
 #include <h/fmt_scan.h>
 #include <h/fmt_compile.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 /*
 ** hash table for deciding if a component is "interesting"
@@ -148,7 +142,6 @@ static struct ftable functable[] = {
        { "friendly",   TF_COMP,    FT_LS_FRIENDLY, FT_PARSEADDR, TFL_PUTS },
 
        { "mymbox",     TF_COMP,    FT_LV_COMPFLAG, FT_MYMBOX, TFL_PUTN },
-       { "addtoseq",   TF_STR,     FT_ADDTOSEQ, 0, 0 },
 
        { "unquote",    TF_EXPR,    FT_LS_UNQUOTE, 0, TFL_PUTS},
 
@@ -192,11 +185,6 @@ static unsigned char *usr_fstring;  /* for CERROR */
 #define CERROR(str) compile_error(str, cp)
 
 /*
-** external prototypes
-*/
-extern char *getusername(void);
-
-/*
 ** static prototypes
 */
 static struct ftable *lookup(char *);
@@ -237,11 +225,7 @@ compile_error(char *str, char *cp)
        usr_fstring[errpos] = '\0';
 
        for (i = errpos-errctx; i < errpos; i++) {
-#ifdef LOCALE
                if (iscntrl(usr_fstring[i]))
-#else
-               if (usr_fstring[i] < 32)
-#endif
                        usr_fstring[i] = '_';
        }